views: Move combobox directory to ui/views/controls/.

views/controls/combobox/combobox.cc

Index: views/controls/combobox/combobox.cc
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
deleted file mode 100644
index 022e710a84281eb1e8c9274a9647a168d6633ec6..0000000000000000000000000000000000000000
--- a/views/controls/combobox/combobox.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "views/controls/combobox/combobox.h"
-
-#include "base/logging.h"
-#include "base/utf_string_conversions.h"
-#include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/base/models/combobox_model.h"
-#include "ui/views/widget/widget.h"
-#include "views/controls/combobox/combobox_listener.h"
-#include "views/controls/native/native_view_host.h"
-
-namespace views {
-
-// static
-const char Combobox::kViewClassName[] = "views/Combobox";
-
-////////////////////////////////////////////////////////////////////////////////
-// Combobox, public:
-
-Combobox::Combobox(ui::ComboboxModel* model)
-    : native_wrapper_(NULL),
-      model_(model),
-      listener_(NULL),
-      selected_item_(0) {
-  set_focusable(true);
-}
-
-Combobox::~Combobox() {
-}
-
-void Combobox::ModelChanged() {
-  selected_item_ = std::min(0, model_->GetItemCount());
-  if (native_wrapper_)
-    native_wrapper_->UpdateFromModel();
-  PreferredSizeChanged();
-}
-
-void Combobox::SetSelectedItem(int index) {
-  selected_item_ = index;
-  if (native_wrapper_)
-    native_wrapper_->UpdateSelectedItem();
-}
-
-void Combobox::SelectionChanged() {
-  int prev_selected_item = selected_item_;
-  selected_item_ = native_wrapper_->GetSelectedItem();
-  if (listener_)
-    listener_->ItemChanged(this, prev_selected_item, selected_item_);
-  if (GetWidget()) {
-    GetWidget()->NotifyAccessibilityEvent(
-        this, ui::AccessibilityTypes::EVENT_VALUE_CHANGED, false);
-  }
-}
-
-void Combobox::SetAccessibleName(const string16& name) {
-  accessible_name_ = name;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Combobox, View overrides:
-
-gfx::Size Combobox::GetPreferredSize() {
-  if (native_wrapper_)
-    return native_wrapper_->GetPreferredSize();
-  return gfx::Size();
-}
-
-void Combobox::Layout() {
-  if (native_wrapper_) {
-    native_wrapper_->GetView()->SetBounds(0, 0, width(), height());
-    native_wrapper_->GetView()->Layout();
-  }
-}
-
-void Combobox::OnEnabledChanged() {
-  View::OnEnabledChanged();
-  if (native_wrapper_)
-    native_wrapper_->UpdateEnabled();
-}
-
-// 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 KeyEvent& e) {
-  if (e.key_code() != ui::VKEY_ESCAPE ||
-      e.IsShiftDown() || e.IsControlDown() || e.IsAltDown()) {
-    return false;
-  }
-  return native_wrapper_ && native_wrapper_->IsDropdownOpen();
-}
-
-void Combobox::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (NativeViewHost::kRenderNativeControlFocus)
-    View::OnPaintFocusBorder(canvas);
-}
-
-bool Combobox::OnKeyPressed(const views::KeyEvent& e) {
-  return native_wrapper_ && native_wrapper_->HandleKeyPressed(e);
-}
-
-bool Combobox::OnKeyReleased(const views::KeyEvent& e) {
-  return native_wrapper_ && native_wrapper_->HandleKeyReleased(e);
-}
-
-void Combobox::OnFocus() {
-  // Forward the focus to the wrapper.
-  if (native_wrapper_)
-    native_wrapper_->SetFocus();
-  else
-    View::OnFocus();  // Will focus the RootView window (so we still get
-                      // keyboard messages).
-}
-
-void Combobox::OnBlur() {
-  if (native_wrapper_)
-    native_wrapper_->HandleBlur();
-}
-
-void Combobox::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_COMBOBOX;
-  state->name = accessible_name_;
-  state->value = model_->GetItemAt(selected_item_);
-  state->index = selected_item();
-  state->count = model()->GetItemCount();
-}
-
-void Combobox::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
-  if (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());
-  }
-}
-
-std::string Combobox::GetClassName() const {
-  return kViewClassName;
-}
-
-}  // namespace views