1 files changed, 330 insertions, 66 deletions

diff --git a/chromium/ui/views/controls/combobox/combobox.cc b/chromium/ui/views/controls/combobox/combobox.cc
index 34f48484755..8ef7b365e75 100644
--- a/chromium/ui/views/controls/combobox/combobox.cc
+++ b/chromium/ui/views/controls/combobox/combobox.cc
@@ -6,32 +6,101 @@
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
+#include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/event.h"
+#include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/gfx/canvas.h"
+#include "ui/native_theme/native_theme.h"
+#include "ui/views/color_constants.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
-#include "ui/views/controls/native/native_view_host.h"
+#include "ui/views/controls/focusable_border.h"
+#include "ui/views/controls/menu/menu_runner.h"
+#include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/controls/prefix_selector.h"
 #include "ui/views/ime/input_method.h"
+#include "ui/views/mouse_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
+namespace {
+
+// Menu border widths
+const int kMenuBorderWidthLeft = 1;
+const int kMenuBorderWidthTop = 1;
+const int kMenuBorderWidthRight = 1;
+const int kMenuBorderWidthBottom = 2;
+
+// Limit how small a combobox can be.
+const int kMinComboboxWidth = 25;
+
+// Size of the combobox arrow margins
+const int kDisclosureArrowLeftPadding = 7;
+const int kDisclosureArrowRightPadding = 7;
+
+// Define the id of the first item in the menu (since it needs to be > 0)
+const int kFirstMenuItemId = 1000;
+
+const SkColor kInvalidTextColor = SK_ColorWHITE;
+
+// Used to indicate that no item is currently selected by the user.
+const int kNoSelection = -1;
+
+// The background to use for invalid comboboxes.
+class InvalidBackground : public Background {
+ public:
+  InvalidBackground() {}
+  virtual ~InvalidBackground() {}
+
+  // Overridden from Background:
+  virtual void Paint(gfx::Canvas* canvas, View* view) const OVERRIDE {
+    gfx::Rect bounds(view->GetLocalBounds());
+    // Inset by 2 to leave 1 empty pixel between background and border.
+    bounds.Inset(2, 2, 2, 2);
+    canvas->FillRect(bounds, kWarningColor);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(InvalidBackground);
+};
+
+// Returns the next or previous valid index (depending on |increment|'s value).
+// Skips separator indices. Returns -1 if there is no valid adjacent index.
+int GetAdjacentIndex(ui::ComboboxModel* model, int increment, int index) {
+  DCHECK(increment == -1 || increment == 1);
+
+  index += increment;
+  while (index >= 0 && index < model->GetItemCount()) {
+    if (!model->IsItemSeparatorAt(index))
+      return index;
+    index += increment;
+  }
+  return kNoSelection;
+}
+
+}  // namespace
+
 // static
-const char Combobox::kViewClassName[] = "Combobox";
+const char Combobox::kViewClassName[] = "views/Combobox";
 
 ////////////////////////////////////////////////////////////////////////////////
 // Combobox, public:
 
 Combobox::Combobox(ui::ComboboxModel* model)
-    : native_wrapper_(NULL),
-      model_(model),
+    : model_(model),
       listener_(NULL),
       selected_index_(model_->GetDefaultIndex()),
-      invalid_(false) {
+      invalid_(false),
+      text_border_(new FocusableBorder()),
+      disclosure_arrow_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+          IDR_MENU_DROPARROW).ToImageSkia()),
+      dropdown_open_(false) {
+  UpdateFromModel();
   set_focusable(true);
+  set_border(text_border_);
 }
 
 Combobox::~Combobox() {
@@ -45,22 +114,13 @@ const gfx::Font& Combobox::GetFont() {
 
 void Combobox::ModelChanged() {
   selected_index_ = std::min(0, model_->GetItemCount());
-  if (native_wrapper_)
-    native_wrapper_->UpdateFromModel();
+  UpdateFromModel();
   PreferredSizeChanged();
 }
 
 void Combobox::SetSelectedIndex(int index) {
   selected_index_ = index;
-  if (native_wrapper_)
-    native_wrapper_->UpdateSelectedIndex();
-}
-
-void Combobox::SelectionChanged() {
-  selected_index_ = native_wrapper_->GetSelectedIndex();
-  if (listener_)
-    listener_->OnSelectedIndexChanged(this);
-  NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_VALUE_CHANGED, false);
+  SchedulePaint();
 }
 
 void Combobox::SetAccessibleName(const string16& name) {
@@ -69,8 +129,13 @@ void Combobox::SetAccessibleName(const string16& name) {
 
 void Combobox::SetInvalid(bool invalid) {
   invalid_ = invalid;
-  if (native_wrapper_)
-    native_wrapper_->ValidityStateChanged();
+  if (invalid) {
+    text_border_->SetColor(kWarningColor);
+    set_background(new InvalidBackground());
+  } else {
+    text_border_->UseDefaultColor();
+    set_background(NULL);
+  }
 }
 
 ui::TextInputClient* Combobox::GetTextInputClient() {
@@ -79,6 +144,28 @@ ui::TextInputClient* Combobox::GetTextInputClient() {
   return selector_.get();
 }
 
+
+bool Combobox::IsItemChecked(int id) const {
+  return false;
+}
+
+bool Combobox::IsCommandEnabled(int id) const {
+  return true;
+}
+
+void Combobox::ExecuteCommand(int id) {
+  // (note that the id received is offset by kFirstMenuItemId)
+  // Revert menu ID offset to map back to combobox model.
+  id -= kFirstMenuItemId;
+  DCHECK_LT(id, model()->GetItemCount());
+  selected_index_ = id;
+  OnSelectionChanged();
+}
+
+bool Combobox::GetAccelerator(int id, ui::Accelerator* accel) {
+  return false;
+}
+
 int Combobox::GetRowCount() {
   return model()->GetItemCount();
 }
@@ -99,65 +186,137 @@ string16 Combobox::GetTextForRow(int row) {
 // Combobox, View overrides:
 
 gfx::Size Combobox::GetPreferredSize() {
-  if (native_wrapper_)
-    return native_wrapper_->GetPreferredSize();
-  return gfx::Size();
-}
+  if (content_size_.IsEmpty())
+    UpdateFromModel();
 
-void Combobox::Layout() {
-  if (native_wrapper_) {
-    native_wrapper_->GetView()->SetBounds(0, 0, width(), height());
-    native_wrapper_->GetView()->Layout();
-  }
+  // The preferred size will drive the local bounds which in turn is used to set
+  // the minimum width for the dropdown list.
+  gfx::Insets insets = GetInsets();
+  int total_width = std::max(kMinComboboxWidth, content_size_.width()) +
+      insets.width() + kDisclosureArrowLeftPadding +
+      disclosure_arrow_->width() + kDisclosureArrowRightPadding;
+
+  return gfx::Size(total_width, content_size_.height() + insets.height());
 }
 
-void Combobox::OnEnabledChanged() {
-  View::OnEnabledChanged();
-  if (native_wrapper_)
-    native_wrapper_->UpdateEnabled();
+const char* Combobox::GetClassName() const {
+  return kViewClassName;
 }
 
-// VKEY_ESCAPE should be handled by this view when the drop down list is active.
-// In other words, the list should be closed instead of the dialog.
 bool Combobox::SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) {
+  // Escape should close the drop down list when it is active, not host UI.
   if (e.key_code() != ui::VKEY_ESCAPE ||
       e.IsShiftDown() || e.IsControlDown() || e.IsAltDown()) {
     return false;
   }
-  return native_wrapper_ && native_wrapper_->IsDropdownOpen();
+  return dropdown_open_;
 }
 
-void Combobox::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (NativeViewHost::kRenderNativeControlFocus)
-    View::OnPaintFocusBorder(canvas);
+bool Combobox::OnMousePressed(const ui::MouseEvent& mouse_event) {
+  RequestFocus();
+  const base::TimeDelta delta = base::Time::Now() - closed_time_;
+  if (mouse_event.IsLeftMouseButton() &&
+      (delta.InMilliseconds() > kMinimumMsBetweenButtonClicks)) {
+    UpdateFromModel();
+    ShowDropDownMenu(ui::MENU_SOURCE_MOUSE);
+  }
+
+  return true;
+}
+
+bool Combobox::OnMouseDragged(const ui::MouseEvent& mouse_event) {
+  return true;
 }
 
 bool Combobox::OnKeyPressed(const ui::KeyEvent& e) {
-  return native_wrapper_ && native_wrapper_->HandleKeyPressed(e);
+  // TODO(oshima): handle IME.
+  DCHECK_EQ(e.type(), ui::ET_KEY_PRESSED);
+
+  DCHECK_GE(selected_index_, 0);
+  DCHECK_LT(selected_index_, model()->GetItemCount());
+  if (selected_index_ < 0 || selected_index_ > model()->GetItemCount())
+    selected_index_ = 0;
+
+  bool show_menu = false;
+  int new_index = kNoSelection;
+  switch (e.key_code()) {
+    // Show the menu on Space.
+    case ui::VKEY_SPACE:
+      show_menu = true;
+      break;
+
+    // Show the menu on Alt+Down (like Windows) or move to the next item if any.
+    case ui::VKEY_DOWN:
+      if (e.IsAltDown())
+        show_menu = true;
+      else
+        new_index = GetAdjacentIndex(model(), 1, selected_index_);
+      break;
+
+    // Move to the end of the list.
+    case ui::VKEY_END:
+    case ui::VKEY_NEXT:  // Page down.
+      new_index = GetAdjacentIndex(model(), -1, model()->GetItemCount());
+      break;
+
+    // Move to the beginning of the list.
+    case ui::VKEY_HOME:
+    case ui::VKEY_PRIOR:  // Page up.
+      new_index = GetAdjacentIndex(model(), 1, -1);
+      break;
+
+    // Move to the previous item if any.
+    case ui::VKEY_UP:
+      new_index = GetAdjacentIndex(model(), -1, selected_index_);
+      break;
+
+    default:
+      return false;
+  }
+
+  if (show_menu) {
+    UpdateFromModel();
+    ShowDropDownMenu(ui::MENU_SOURCE_KEYBOARD);
+  } else if (new_index != selected_index_ && new_index != kNoSelection) {
+    DCHECK(!model()->IsItemSeparatorAt(new_index));
+    selected_index_ = new_index;
+    OnSelectionChanged();
+  }
+
+  return true;
 }
 
 bool Combobox::OnKeyReleased(const ui::KeyEvent& e) {
-  return native_wrapper_ && native_wrapper_->HandleKeyReleased(e);
+  return false;  // crbug.com/127520
+}
+
+void Combobox::OnGestureEvent(ui::GestureEvent* gesture) {
+  if (gesture->type() == ui::ET_GESTURE_TAP) {
+    UpdateFromModel();
+    ShowDropDownMenu(ui::MENU_SOURCE_TOUCH);
+    gesture->StopPropagation();
+    return;
+  }
+  View::OnGestureEvent(gesture);
+}
+
+void Combobox::OnPaint(gfx::Canvas* canvas) {
+  OnPaintBackground(canvas);
+  PaintText(canvas);
+  OnPaintBorder(canvas);
 }
 
 void Combobox::OnFocus() {
   GetInputMethod()->OnFocus();
-  // Forward the focus to the wrapper.
-  if (native_wrapper_) {
-    native_wrapper_->SetFocus();
-    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_FOCUS, true);
-  } else {
-    View::OnFocus();  // Will focus the RootView window (so we still get
-                      // keyboard messages).
-  }
+  text_border_->set_has_focus(true);
+  View::OnFocus();
 }
 
 void Combobox::OnBlur() {
   GetInputMethod()->OnBlur();
   if (selector_)
     selector_->OnViewBlur();
-  if (native_wrapper_)
-    native_wrapper_->HandleBlur();
+  text_border_->set_has_focus(false);
 }
 
 void Combobox::GetAccessibleState(ui::AccessibleViewState* state) {
@@ -168,24 +327,129 @@ void Combobox::GetAccessibleState(ui::AccessibleViewState* state) {
   state->count = model_->GetItemCount();
 }
 
-void Combobox::ViewHierarchyChanged(
-    const ViewHierarchyChangedDetails& details) {
-  if (details.is_add && !native_wrapper_ && GetWidget()) {
-    // The native wrapper's lifetime will be managed by the view hierarchy after
-    // we call AddChildView.
-    native_wrapper_ = NativeComboboxWrapper::CreateWrapper(this);
-    AddChildView(native_wrapper_->GetView());
-    // The underlying native widget may not be created until the wrapper is
-    // parented. For this reason the wrapper is only updated after adding its
-    // view.
-    native_wrapper_->UpdateFromModel();
-    native_wrapper_->UpdateSelectedIndex();
-    native_wrapper_->UpdateEnabled();
+void Combobox::UpdateFromModel() {
+  int max_width = 0;
+  const gfx::Font& font = Combobox::GetFont();
+
+  MenuItemView* menu = new MenuItemView(this);
+  // MenuRunner owns |menu|.
+  dropdown_list_menu_runner_.reset(new MenuRunner(menu));
+
+  int num_items = model()->GetItemCount();
+  for (int i = 0; i < num_items; ++i) {
+    if (model()->IsItemSeparatorAt(i)) {
+      menu->AppendSeparator();
+      continue;
+    }
+
+    string16 text = model()->GetItemAt(i);
+
+    // Inserting the Unicode formatting characters if necessary so that the
+    // text is displayed correctly in right-to-left UIs.
+    base::i18n::AdjustStringForLocaleDirection(&text);
+
+    menu->AppendMenuItem(i + kFirstMenuItemId, text, MenuItemView::NORMAL);
+    max_width = std::max(max_width, font.GetStringWidth(text));
   }
+
+  content_size_.SetSize(max_width, font.GetHeight());
 }
 
-const char* Combobox::GetClassName() const {
-  return kViewClassName;
+void Combobox::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
+  rect->set_x(GetMirroredXForRect(*rect));
+}
+
+void Combobox::PaintText(gfx::Canvas* canvas) {
+  gfx::Insets insets = GetInsets();
+
+  canvas->Save();
+  canvas->ClipRect(GetContentsBounds());
+
+  int x = insets.left();
+  int y = insets.top();
+  int text_height = height() - insets.height();
+  SkColor text_color = invalid() ? kInvalidTextColor :
+      GetNativeTheme()->GetSystemColor(
+          ui::NativeTheme::kColorId_LabelEnabledColor);
+
+  DCHECK_GE(selected_index_, 0);
+  DCHECK_LT(selected_index_, model()->GetItemCount());
+  if (selected_index_ < 0 || selected_index_ > model()->GetItemCount())
+    selected_index_ = 0;
+  string16 text = model()->GetItemAt(selected_index_);
+
+  int disclosure_arrow_offset = width() - disclosure_arrow_->width()
+      - kDisclosureArrowLeftPadding - kDisclosureArrowRightPadding;
+
+  const gfx::Font& font = Combobox::GetFont();
+  int text_width = font.GetStringWidth(text);
+  if ((text_width + insets.width()) > disclosure_arrow_offset)
+    text_width = disclosure_arrow_offset - insets.width();
+
+  gfx::Rect text_bounds(x, y, text_width, text_height);
+  AdjustBoundsForRTLUI(&text_bounds);
+  canvas->DrawStringInt(text, font, text_color, text_bounds);
+
+  gfx::Rect arrow_bounds(disclosure_arrow_offset + kDisclosureArrowLeftPadding,
+                         height() / 2 - disclosure_arrow_->height() / 2,
+                         disclosure_arrow_->width(),
+                         disclosure_arrow_->height());
+  AdjustBoundsForRTLUI(&arrow_bounds);
+
+  SkPaint paint;
+  // This makes the arrow subtractive.
+  if (invalid())
+    paint.setXfermodeMode(SkXfermode::kDstOut_Mode);
+  canvas->DrawImageInt(*disclosure_arrow_, arrow_bounds.x(), arrow_bounds.y(),
+                       paint);
+
+  canvas->Restore();
+}
+
+void Combobox::ShowDropDownMenu(ui::MenuSourceType source_type) {
+  if (!dropdown_list_menu_runner_.get())
+    UpdateFromModel();
+
+  // Extend the menu to the width of the combobox.
+  MenuItemView* menu = dropdown_list_menu_runner_->GetMenu();
+  SubmenuView* submenu = menu->CreateSubmenu();
+  submenu->set_minimum_preferred_width(size().width() -
+                                (kMenuBorderWidthLeft + kMenuBorderWidthRight));
+
+  gfx::Rect lb = GetLocalBounds();
+  gfx::Point menu_position(lb.origin());
+
+  // Inset the menu's requested position so the border of the menu lines up
+  // with the border of the combobox.
+  menu_position.set_x(menu_position.x() + kMenuBorderWidthLeft);
+  menu_position.set_y(menu_position.y() + kMenuBorderWidthTop);
+  lb.set_width(lb.width() - (kMenuBorderWidthLeft + kMenuBorderWidthRight));
+
+  View::ConvertPointToScreen(this, &menu_position);
+  if (menu_position.x() < 0)
+      menu_position.set_x(0);
+
+  gfx::Rect bounds(menu_position, lb.size());
+
+  dropdown_open_ = true;
+  if (dropdown_list_menu_runner_->RunMenuAt(
+          GetWidget(), NULL, bounds, MenuItemView::TOPLEFT, source_type, 0) ==
+      MenuRunner::MENU_DELETED)
+    return;
+  dropdown_open_ = false;
+  closed_time_ = base::Time::Now();
+
+  // Need to explicitly clear mouse handler so that events get sent
+  // properly after the menu finishes running. If we don't do this, then
+  // the first click to other parts of the UI is eaten.
+  SetMouseHandler(NULL);
+}
+
+void Combobox::OnSelectionChanged() {
+  if (listener_)
+    listener_->OnSelectedIndexChanged(this);
+  NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_VALUE_CHANGED, false);
+  SchedulePaint();
 }
 
 }  // namespace views