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

BUG=104039
R=ben@chromium.org

Review URL: http://codereview.chromium.org/8682011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111478 0039d316-1c4b-4281-b951-d872f2087c98

29 files changed, 63 insertions, 63 deletions

diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index ab620dd..4c09e36 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -17,9 +17,9 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
 
diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h
index 87e0222..7285c34 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.h
+++ b/chrome/browser/chromeos/options/vpn_config_view.h
@@ -12,8 +12,8 @@
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/ui/select_file_dialog.h"
+#include "ui/views/controls/combobox/combobox_listener.h"
 #include "views/controls/button/button.h"
-#include "views/controls/combobox/combobox_listener.h"
 #include "views/controls/textfield/textfield_controller.h"
 #include "views/view.h"
 
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 77d7f45..0d993de 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -15,11 +15,11 @@
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/image_button.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
 
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index 295dce3..8e337fa 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -15,8 +15,8 @@
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/views/controls/combobox/combobox_listener.h"
 #include "views/controls/button/button.h"
-#include "views/controls/combobox/combobox_listener.h"
 #include "views/controls/textfield/textfield_controller.h"
 #include "views/view.h"
 
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index aeffed5..e486518 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -23,12 +23,12 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/events/event.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/button/text_button.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/textfield/textfield.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
index 110ca45..b12da6f 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
@@ -12,8 +12,8 @@
 #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h"
 #include "googleurl/src/gurl.h"
 #include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/controls/combobox/combobox_listener.h"
 #include "views/controls/button/button.h"
-#include "views/controls/combobox/combobox_listener.h"
 #include "views/controls/link_listener.h"
 
 class Profile;
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
index 9067829..4bc8fb4 100644
--- a/chrome/browser/ui/views/cookie_info_view.cc
+++ b/chrome/browser/ui/views/cookie_info_view.cc
@@ -17,11 +17,11 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/border.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
 
diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h
index 90bd3cc..0354abe 100644
--- a/chrome/browser/ui/views/cookie_info_view.h
+++ b/chrome/browser/ui/views/cookie_info_view.h
@@ -14,7 +14,7 @@
 #include "base/string16.h"
 #include "net/base/cookie_monster.h"
 #include "ui/base/models/combobox_model.h"
-#include "views/controls/combobox/combobox_listener.h"
+#include "ui/views/controls/combobox/combobox_listener.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc
index 24c882b..1eb8016 100644
--- a/chrome/browser/ui/views/uninstall_view.cc
+++ b/chrome/browser/ui/views/uninstall_view.cc
@@ -14,10 +14,10 @@
 #include "chrome/installer/util/shell_util.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/button/checkbox.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/label.h"
 
 UninstallView::UninstallView(int* user_selection)
diff --git a/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index 022e710..24c122b 100644
--- a/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -2,15 +2,15 @@
 // 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 "ui/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/controls/combobox/combobox_listener.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/combobox/combobox_listener.h"
 #include "views/controls/native/native_view_host.h"
 
 namespace views {
diff --git a/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h
index 8579122..dbd62db 100644
--- a/views/controls/combobox/combobox.h
+++ b/ui/views/controls/combobox/combobox.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
-#define VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
+#ifndef UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
+#define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
 #pragma once
 
 #include <string>
 
 #include "ui/gfx/native_widget_types.h"
-#include "views/controls/combobox/native_combobox_wrapper.h"
+#include "ui/views/controls/combobox/native_combobox_wrapper.h"
 #include "views/view.h"
 
 namespace ui {
@@ -99,4 +99,4 @@ class VIEWS_EXPORT Combobox : public View {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
+#endif  // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
diff --git a/views/controls/combobox/combobox_listener.h b/ui/views/controls/combobox/combobox_listener.h
index 3453ce1..cd0f48a 100644
--- a/views/controls/combobox/combobox_listener.h
+++ b/ui/views/controls/combobox/combobox_listener.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_COMBOBOX_COMBOBOX_LISTENER_H_
-#define VIEWS_CONTROLS_COMBOBOX_COMBOBOX_LISTENER_H_
+#ifndef UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_LISTENER_H_
+#define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_LISTENER_H_
 #pragma once
 
 namespace views {
@@ -25,4 +25,4 @@ class ComboboxListener {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_COMBOBOX_COMBOBOX_LISTENER_H_
+#endif  // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_LISTENER_H_
diff --git a/views/controls/combobox/native_combobox_gtk.cc b/ui/views/controls/combobox/native_combobox_gtk.cc
index 810ff42..a09ad57 100644
--- a/views/controls/combobox/native_combobox_gtk.cc
+++ b/ui/views/controls/combobox/native_combobox_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/controls/combobox/native_combobox_gtk.h"
+#include "ui/views/controls/combobox/native_combobox_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -11,9 +11,9 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/views/controls/combobox/combobox.h"
+#include "ui/views/controls/combobox/native_combobox_views.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/combobox/combobox.h"
-#include "views/controls/combobox/native_combobox_views.h"
 #include "views/views_delegate.h"
 
 namespace views {
diff --git a/views/controls/combobox/native_combobox_gtk.h b/ui/views/controls/combobox/native_combobox_gtk.h
index a55bb91..9466dcd 100644
--- a/views/controls/combobox/native_combobox_gtk.h
+++ b/ui/views/controls/combobox/native_combobox_gtk.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
-#define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
+#ifndef UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
+#define UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
 #pragma once
 
 #include "ui/base/gtk/gtk_signal.h"
-#include "views/controls/combobox/native_combobox_wrapper.h"
+#include "ui/views/controls/combobox/native_combobox_wrapper.h"
 #include "views/controls/native_control_gtk.h"
 
 namespace views {
@@ -61,4 +61,4 @@ class NativeComboboxGtk : public NativeControlGtk,
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
+#endif  // UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
diff --git a/views/controls/combobox/native_combobox_views.cc b/ui/views/controls/combobox/native_combobox_views.cc
index f48f9bd..1e8e535 100644
--- a/views/controls/combobox/native_combobox_views.cc
+++ b/ui/views/controls/combobox/native_combobox_views.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/controls/combobox/native_combobox_views.h"
+#include "ui/views/controls/combobox/native_combobox_views.h"
 
 #include <algorithm>
 
@@ -15,11 +15,11 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/path.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "views/background.h"
 #include "views/border.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/focusable_border.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
diff --git a/views/controls/combobox/native_combobox_views.h b/ui/views/controls/combobox/native_combobox_views.h
index 9a87259..571b70b 100644
--- a/views/controls/combobox/native_combobox_views.h
+++ b/ui/views/controls/combobox/native_combobox_views.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_VIEWS_H_
-#define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_VIEWS_H_
+#ifndef UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_VIEWS_H_
+#define UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_VIEWS_H_
 #pragma once
 
-#include "views/controls/combobox/native_combobox_wrapper.h"
+#include "ui/views/controls/combobox/native_combobox_wrapper.h"
 #include "views/controls/menu/menu_delegate.h"
 #include "views/view.h"
 
@@ -101,4 +101,4 @@ class NativeComboboxViews : public views::View,
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_VIEWS_H_
+#endif  // UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_VIEWS_H_
diff --git a/views/controls/combobox/native_combobox_views_unittest.cc b/ui/views/controls/combobox/native_combobox_views_unittest.cc
index 30b03e1..d11a8d2 100644
--- a/views/controls/combobox/native_combobox_views_unittest.cc
+++ b/ui/views/controls/combobox/native_combobox_views_unittest.cc
@@ -5,12 +5,12 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/views/controls/combobox/combobox.h"
+#include "ui/views/controls/combobox/native_combobox_views.h"
 #include "ui/views/ime/mock_input_method.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/combobox/combobox.h"
-#include "views/controls/combobox/native_combobox_views.h"
 
 namespace {
 
diff --git a/views/controls/combobox/native_combobox_win.cc b/ui/views/controls/combobox/native_combobox_win.cc
index 151cab4..97cd440 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/ui/views/controls/combobox/native_combobox_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/controls/combobox/native_combobox_win.h"
+#include "ui/views/controls/combobox/native_combobox_win.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ -11,9 +11,9 @@
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_theme_win.h"
+#include "ui/views/controls/combobox/combobox.h"
+#include "ui/views/controls/combobox/native_combobox_views.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/combobox/combobox.h"
-#include "views/controls/combobox/native_combobox_views.h"
 
 namespace views {
 
diff --git a/views/controls/combobox/native_combobox_win.h b/ui/views/controls/combobox/native_combobox_win.h
index 640d3e1..ee22cee 100644
--- a/views/controls/combobox/native_combobox_win.h
+++ b/ui/views/controls/combobox/native_combobox_win.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WIN_H_
-#define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WIN_H_
+#ifndef UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WIN_H_
+#define UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WIN_H_
 #pragma once
 
-#include "views/controls/combobox/native_combobox_wrapper.h"
+#include "ui/views/controls/combobox/native_combobox_wrapper.h"
 #include "views/controls/native_control_win.h"
 
 namespace views {
@@ -55,4 +55,4 @@ class NativeComboboxWin : public NativeControlWin,
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WIN_H_
+#endif  // UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WIN_H_
diff --git a/views/controls/combobox/native_combobox_wrapper.h b/ui/views/controls/combobox/native_combobox_wrapper.h
index 327d02db..959871e 100644
--- a/views/controls/combobox/native_combobox_wrapper.h
+++ b/ui/views/controls/combobox/native_combobox_wrapper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
-#define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
+#ifndef UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
+#define UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
 #pragma once
 
 #include "ui/gfx/native_widget_types.h"
@@ -68,4 +68,4 @@ class VIEWS_EXPORT NativeComboboxWrapper {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
+#endif  // UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
diff --git a/ui/views/examples/combobox_example.cc b/ui/views/examples/combobox_example.cc
index e035743..b271ebe 100644
--- a/ui/views/examples/combobox_example.cc
+++ b/ui/views/examples/combobox_example.cc
@@ -7,8 +7,8 @@
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/layout/fill_layout.h"
-#include "views/controls/combobox/combobox.h"
 
 namespace {
 
diff --git a/ui/views/examples/combobox_example.h b/ui/views/examples/combobox_example.h
index 56aba1c..7b3d15a 100644
--- a/ui/views/examples/combobox_example.h
+++ b/ui/views/examples/combobox_example.h
@@ -8,8 +8,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/combobox/combobox_listener.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/native_theme_button_example.cc b/ui/views/examples/native_theme_button_example.cc
index cdd3f2a..ded8483 100644
--- a/ui/views/examples/native_theme_button_example.cc
+++ b/ui/views/examples/native_theme_button_example.cc
@@ -12,9 +12,9 @@
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/examples/example_combobox_model.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/label.h"
 #include "views/native_theme_painter.h"
 
diff --git a/ui/views/examples/native_theme_button_example.h b/ui/views/examples/native_theme_button_example.h
index 8b59fec..7a116f1 100644
--- a/ui/views/examples/native_theme_button_example.h
+++ b/ui/views/examples/native_theme_button_example.h
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "ui/gfx/native_theme.h"
+#include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/examples/example_base.h"
 #include "views/controls/button/custom_button.h"
-#include "views/controls/combobox/combobox_listener.h"
 #include "views/native_theme_delegate.h"
 #include "views/native_theme_painter.h"
 
diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc
index 415337a..cac7e1f 100644
--- a/ui/views/examples/text_example.cc
+++ b/ui/views/examples/text_example.cc
@@ -8,10 +8,10 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/examples/example_combobox_model.h"
 #include "ui/views/layout/grid_layout.h"
 #include "views/controls/button/checkbox.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/label.h"
 #include "views/view.h"
 
diff --git a/ui/views/examples/text_example.h b/ui/views/examples/text_example.h
index e99fb1a..e9e096f 100644
--- a/ui/views/examples/text_example.h
+++ b/ui/views/examples/text_example.h
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/examples/example_base.h"
 #include "views/controls/button/button.h"
-#include "views/controls/combobox/combobox_listener.h"
 
 namespace views {
 class Checkbox;
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index 87bfc26..e886a95 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -7,13 +7,13 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/focus/focus_manager_test.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/button/text_button.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/native/native_view_host.h"
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index 20e829c..d4e6989 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -11,9 +11,9 @@
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/combobox/combobox.h"
 
 using ui::ViewProp;
 
diff --git a/views/views.gyp b/views/views.gyp
index 088388f..1e75213 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -68,16 +68,6 @@
         'controls/button/radio_button.h',
         'controls/button/text_button.cc',
         'controls/button/text_button.h',
-        'controls/combobox/combobox.cc',
-        'controls/combobox/combobox.h',
-        'controls/combobox/combobox_listener.h',
-        'controls/combobox/native_combobox_gtk.cc',
-        'controls/combobox/native_combobox_gtk.h',
-        'controls/combobox/native_combobox_views.cc',
-        'controls/combobox/native_combobox_views.h',
-        'controls/combobox/native_combobox_win.cc',
-        'controls/combobox/native_combobox_win.h',
-        'controls/combobox/native_combobox_wrapper.h',
         'controls/focusable_border.cc',
         'controls/focusable_border.h',
         'controls/image_view.cc',
@@ -260,6 +250,16 @@
         '../ui/views/bubble/bubble_delegate.h',
         '../ui/views/bubble/bubble_frame_view.cc',
         '../ui/views/bubble/bubble_frame_view.h',
+        '../ui/views/controls/combobox/combobox.cc',
+        '../ui/views/controls/combobox/combobox.h',
+        '../ui/views/controls/combobox/combobox_listener.h',
+        '../ui/views/controls/combobox/native_combobox_gtk.cc',
+        '../ui/views/controls/combobox/native_combobox_gtk.h',
+        '../ui/views/controls/combobox/native_combobox_views.cc',
+        '../ui/views/controls/combobox/native_combobox_views.h',
+        '../ui/views/controls/combobox/native_combobox_win.cc',
+        '../ui/views/controls/combobox/native_combobox_win.h',
+        '../ui/views/controls/combobox/native_combobox_wrapper.h',
         '../ui/views/controls/table/native_table_wrapper.h',
         '../ui/views/controls/table/native_table_gtk.cc',
         '../ui/views/controls/table/native_table_gtk.h',
@@ -509,6 +509,7 @@
         '../ui/views/animation/bounds_animator_unittest.cc',
         '../ui/views/bubble/bubble_delegate_unittest.cc',
         '../ui/views/bubble/bubble_frame_view_unittest.cc',
+        '../ui/views/controls/combobox/native_combobox_views_unittest.cc',
         '../ui/views/controls/table/table_view_unittest.cc',
         '../ui/views/events/event_unittest.cc',
         '../ui/views/focus/accelerator_handler_gtk_unittest.cc',
@@ -535,7 +536,6 @@
         'controls/progress_bar_unittest.cc',
         'controls/single_split_view_unittest.cc',
         'controls/tabbed_pane/tabbed_pane_unittest.cc',
-        'controls/combobox/native_combobox_views_unittest.cc',
         'controls/menu/menu_model_adapter_unittest.cc',
         'controls/textfield/native_textfield_views_unittest.cc',
         'controls/textfield/textfield_views_model_unittest.cc',
@@ -576,9 +576,9 @@
             '../ui/aura/aura.gyp:test_support_aura',
           ],
           'sources/': [
+            ['exclude', '../ui/views/controls/combobox/native_combobox_views_unittest.cc'],
             ['exclude', '../ui/views/controls/table/table_view_unittest.cc'],
             ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'],
-            ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'],
             ['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'],
           ],
         }, {