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

BUG=104039
R=maruel@chromium.org
TBR=ben@chromium.org

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

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

17 files changed, 52 insertions, 47 deletions

diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc
index f22ef16..603dc01 100644
--- a/chrome/browser/ui/views/collected_cookies_win.cc
+++ b/chrome/browser/ui/views/collected_cookies_win.cc
@@ -25,6 +25,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
@@ -32,7 +33,6 @@
 #include "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
 
 namespace browser {
 
diff --git a/chrome/browser/ui/views/collected_cookies_win.h b/chrome/browser/ui/views/collected_cookies_win.h
index 519122a..9e1ef79 100644
--- a/chrome/browser/ui/views/collected_cookies_win.h
+++ b/chrome/browser/ui/views/collected_cookies_win.h
@@ -10,9 +10,9 @@
 #include "chrome/common/content_settings.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/controls/tabbed_pane/tabbed_pane_listener.h"
 
 class ConstrainedWindow;
 class CookieInfoView;
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index e1e490c..34e32ad 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_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/tabbed_pane/native_tabbed_pane_gtk.h"
+#include "ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -12,12 +12,12 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/skia_utils_gtk.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/widget.h"
 #include "views/background.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
-#include "views/controls/tabbed_pane/tabbed_pane_listener.h"
 
 namespace views {
 
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.h b/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h
index 28b32e6..c37af6c 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.h
+++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.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_TABBED_PANE_NATIVE_TABBED_PANE_GTK_H_
-#define VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_GTK_H_
+#ifndef UI_VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_GTK_H_
+#define UI_VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_GTK_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 #include "views/controls/native_control_gtk.h"
-#include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 
 namespace views {
 
@@ -66,4 +66,4 @@ class NativeTabbedPaneGtk : public NativeControlGtk,
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_GTK_H_
+#endif  // UI_VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_GTK_H_
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index 5e29dba..3648e1f 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_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/tabbed_pane/native_tabbed_pane_win.h"
+#include "ui/views/controls/tabbed_pane/native_tabbed_pane_win.h"
 
 #include <vssym32.h>
 
@@ -14,11 +14,11 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_theme_win.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
-#include "views/controls/tabbed_pane/tabbed_pane_listener.h"
 
 namespace views {
 
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.h b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.h
index f8bd4ed..8935c1a 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.h
+++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.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_TABBED_PANE_NATIVE_TABBED_PANE_WIN_H_
-#define VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WIN_H_
+#ifndef UI_VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WIN_H_
+#define UI_VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WIN_H_
 #pragma once
 
 #include <vector>
 
+#include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 #include "views/controls/native_control_win.h"
-#include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 
 namespace views {
 
@@ -89,4 +89,4 @@ class NativeTabbedPaneWin : public NativeControlWin,
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WIN_H_
+#endif  // UI_VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WIN_H_
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h b/ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h
index 0a35992..90a651f 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h
+++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h
@@ -2,11 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WRAPPER_H_
-#define VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WRAPPER_H_
+#ifndef UI_VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WRAPPER_H_
+#define UI_VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WRAPPER_H_
 #pragma once
 
 #include "base/string16.h"
+#include "ui/gfx/native_widget_types.h"
+
+namespace gfx {
+class Size;
+}
 
 namespace views {
 
@@ -71,4 +76,4 @@ class NativeTabbedPaneWrapper {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WRAPPER_H_
+#endif  // UI_VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_WRAPPER_H_
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc
index 6931fe2..1f797df 100644
--- a/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.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/tabbed_pane/tabbed_pane.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/native/native_view_host.h"
-#include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
-#include "views/controls/tabbed_pane/tabbed_pane_listener.h"
 
 namespace views {
 
diff --git a/views/controls/tabbed_pane/tabbed_pane.h b/ui/views/controls/tabbed_pane/tabbed_pane.h
index 6161d76..97a9d63 100644
--- a/views/controls/tabbed_pane/tabbed_pane.h
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.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_TABBED_PANE_H_
-#define VIEWS_CONTROLS_TABBED_PANE_H_
+#ifndef UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
+#define UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -102,4 +102,4 @@ class VIEWS_EXPORT TabbedPane : public View {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TABBED_PANE_H_
+#endif  // UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
diff --git a/views/controls/tabbed_pane/tabbed_pane_listener.h b/ui/views/controls/tabbed_pane/tabbed_pane_listener.h
index 3d14a38..05df022 100644
--- a/views/controls/tabbed_pane/tabbed_pane_listener.h
+++ b/ui/views/controls/tabbed_pane/tabbed_pane_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_TABBED_PANE_TABBED_PANE_LISTENER_H_
-#define VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_LISTENER_H_
+#ifndef UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_LISTENER_H_
+#define UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_LISTENER_H_
 #pragma once
 
 namespace views {
@@ -21,4 +21,4 @@ class TabbedPaneListener {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_LISTENER_H_
+#endif  // UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_LISTENER_H_
diff --git a/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
index 80264c5..e209c8b 100644
--- a/views/controls/tabbed_pane/tabbed_pane_unittest.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
@@ -5,10 +5,10 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
 
 namespace views {
 
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index f687d28..b776c60 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -12,6 +12,7 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/examples/bubble_example.h"
 #include "ui/views/examples/button_example.h"
 #include "ui/views/examples/combobox_example.h"
@@ -37,7 +38,6 @@
 #include "ui/views/widget/widget.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
 
 #if defined(OS_WIN)
 // TableView is not yet ported to Linux.
diff --git a/ui/views/examples/tabbed_pane_example.cc b/ui/views/examples/tabbed_pane_example.cc
index 03a7e32..52338f5 100644
--- a/ui/views/examples/tabbed_pane_example.cc
+++ b/ui/views/examples/tabbed_pane_example.cc
@@ -5,8 +5,8 @@
 #include "ui/views/examples/tabbed_pane_example.h"
 
 #include "base/utf_string_conversions.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/tabbed_pane_example.h b/ui/views/examples/tabbed_pane_example.h
index 1564ac6..d5192f2 100644
--- a/ui/views/examples/tabbed_pane_example.h
+++ b/ui/views/examples/tabbed_pane_example.h
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/examples/example_base.h"
 #include "views/controls/button/text_button.h"
-#include "views/controls/tabbed_pane/tabbed_pane_listener.h"
 
 namespace views {
 class TabbedPane;
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index c55e4e0..af4ea62 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -13,8 +13,8 @@
 #include "views/controls/textfield/textfield.h"
 
 #if !defined(USE_AURA)
-#include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
+#include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #endif
 
 #if defined(OS_LINUX)
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index e886a95..6eb4416 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -21,7 +21,7 @@
 #include "views/controls/textfield/textfield.h"
 
 #if !defined(USE_AURA)
-#include "views/controls/tabbed_pane/tabbed_pane.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #endif
 
 namespace views {
diff --git a/views/views.gyp b/views/views.gyp
index 1e75213..c98573a 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -178,14 +178,6 @@
         'controls/single_split_view.cc',
         'controls/single_split_view.h',
         'controls/single_split_view_listener.h',
-        'controls/tabbed_pane/native_tabbed_pane_gtk.cc',
-        'controls/tabbed_pane/native_tabbed_pane_gtk.h',
-        'controls/tabbed_pane/native_tabbed_pane_win.cc',
-        'controls/tabbed_pane/native_tabbed_pane_win.h',
-        'controls/tabbed_pane/native_tabbed_pane_wrapper.h',
-        'controls/tabbed_pane/tabbed_pane.cc',
-        'controls/tabbed_pane/tabbed_pane.h',
-        'controls/tabbed_pane/tabbed_pane_listener.h',
         'controls/textfield/gtk_views_entry.cc',
         'controls/textfield/gtk_views_entry.h',
         'controls/textfield/gtk_views_textview.cc',
@@ -260,6 +252,14 @@
         '../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/tabbed_pane/native_tabbed_pane_gtk.cc',
+        '../ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h',
+        '../ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc',
+        '../ui/views/controls/tabbed_pane/native_tabbed_pane_win.h',
+        '../ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h',
+        '../ui/views/controls/tabbed_pane/tabbed_pane.cc',
+        '../ui/views/controls/tabbed_pane/tabbed_pane.h',
+        '../ui/views/controls/tabbed_pane/tabbed_pane_listener.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',
@@ -400,9 +400,9 @@
             'controls/native_control.h',
             'controls/scrollbar/bitmap_scroll_bar.cc',
             'controls/scrollbar/bitmap_scroll_bar.h',
-            'controls/tabbed_pane/tabbed_pane.cc',
-            'controls/tabbed_pane/tabbed_pane.h',
             'drag_utils_win.cc',
+            '../ui/views/controls/tabbed_pane/tabbed_pane.cc',
+            '../ui/views/controls/tabbed_pane/tabbed_pane.h',
             '../ui/views/controls/table/group_table_view.cc',
             '../ui/views/controls/table/group_table_view.h',
             '../ui/views/controls/table/native_table_wrapper.h',
@@ -510,6 +510,7 @@
         '../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/tabbed_pane/tabbed_pane_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/label_unittest.cc',
         'controls/progress_bar_unittest.cc',
         'controls/single_split_view_unittest.cc',
-        'controls/tabbed_pane/tabbed_pane_unittest.cc',
         'controls/menu/menu_model_adapter_unittest.cc',
         'controls/textfield/native_textfield_views_unittest.cc',
         'controls/textfield/textfield_views_model_unittest.cc',
@@ -577,9 +577,9 @@
           ],
           'sources/': [
             ['exclude', '../ui/views/controls/combobox/native_combobox_views_unittest.cc'],
+            ['exclude', '../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc'],
             ['exclude', '../ui/views/controls/table/table_view_unittest.cc'],
             ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'],
-            ['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'],
           ],
         }, {
           'sources/': [