[Mac] Organize all tab/tab strip files into chrome/browser/ui/cocoa/tabs/.

BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/6362007

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

40 files changed, 102 insertions, 98 deletions

diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index ab353cbc..00a86d5 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -43,8 +43,8 @@
 #import "chrome/browser/ui/cocoa/history_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"
 #import "chrome/browser/ui/cocoa/options/preferences_window_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
-#import "chrome/browser/ui/cocoa/tab_window_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
 #include "chrome/browser/ui/options/options_window.h"
 #include "chrome/common/app_mode_common_mac.h"
diff --git a/chrome/browser/automation/automation_provider_mac.mm b/chrome/browser/automation/automation_provider_mac.mm
index f19bec2..8583a46 100644
--- a/chrome/browser/automation/automation_provider_mac.mm
+++ b/chrome/browser/automation/automation_provider_mac.mm
@@ -11,8 +11,8 @@
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
-#include "chrome/browser/ui/cocoa/tab_window_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
+#include "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/automation_messages.h"
 #include "gfx/point.h"
diff --git a/chrome/browser/automation/testing_automation_provider_mac.mm b/chrome/browser/automation/testing_automation_provider_mac.mm
index e92a5ade..b4fabd0 100644
--- a/chrome/browser/automation/testing_automation_provider_mac.mm
+++ b/chrome/browser/automation/testing_automation_provider_mac.mm
@@ -13,7 +13,7 @@
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#include "chrome/browser/ui/cocoa/tab_window_controller.h"
+#include "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
index f3f6976..a1aa462 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
@@ -16,7 +16,7 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_state.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
-#include "chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.h"
+#include "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 #import "chrome/common/chrome_application_mac.h"
 #include "webkit/glue/window_open_disposition.h"
 
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h
index 4ff053e..7c2347e 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.h
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h
@@ -20,8 +20,8 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #import "chrome/browser/ui/cocoa/tab_contents_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
-#import "chrome/browser/ui/cocoa/tab_window_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #import "chrome/browser/ui/cocoa/view_resizer.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 9f19719..95e0bc8 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -48,9 +48,9 @@
 #import "chrome/browser/ui/cocoa/sidebar_controller.h"
 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_view.h"
-#import "chrome/browser/ui/cocoa/tab_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #import "chrome/browser/ui/cocoa/tabpose_window.h"
 #import "chrome/browser/ui/cocoa/toolbar_controller.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 3157f8e..eceffea 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -19,9 +19,9 @@
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_controller.h"
 #import "chrome/browser/ui/cocoa/previewable_contents_controller.h"
-#import "chrome/browser/ui/cocoa/side_tab_strip_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_view.h"
+#import "chrome/browser/ui/cocoa/tabs/side_tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/toolbar_controller.h"
 #include "chrome/common/pref_names.h"
 
diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window.mm b/chrome/browser/ui/cocoa/chrome_event_processing_window.mm
index be6591b..2275e2a 100644
--- a/chrome/browser/ui/cocoa/chrome_event_processing_window.mm
+++ b/chrome/browser/ui/cocoa/chrome_event_processing_window.mm
@@ -8,7 +8,7 @@
 #import "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #import "chrome/browser/ui/cocoa/browser_frame_view.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 
 typedef int (*KeyToCommandMapper)(bool, bool, bool, bool, int, unichar);
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
index 230f91c..b51607d 100644
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
@@ -15,7 +15,7 @@
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/find_pasteboard.h"
 #import "chrome/browser/ui/cocoa/focus_tracker.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
diff --git a/chrome/browser/ui/cocoa/framed_browser_window.mm b/chrome/browser/ui/cocoa/framed_browser_window.mm
index bf46c08..30064cb 100644
--- a/chrome/browser/ui/cocoa/framed_browser_window.mm
+++ b/chrome/browser/ui/cocoa/framed_browser_window.mm
@@ -8,7 +8,7 @@
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #import "chrome/browser/ui/cocoa/browser_frame_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index f04a43a..4028d84 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -25,8 +25,8 @@
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/scoped_cg_context_state_mac.h"
diff --git a/chrome/browser/ui/cocoa/tabs/OWNERS b/chrome/browser/ui/cocoa/tabs/OWNERS
new file mode 100644
index 0000000..30d99dc
--- /dev/null
+++ b/chrome/browser/ui/cocoa/tabs/OWNERS
@@ -0,0 +1,4 @@
+avi@chromium.org
+pinkerton@chromium.org
+rohitrao@chromium.org
+viettrungluu@chromium.org
diff --git a/chrome/browser/ui/cocoa/side_tab_strip_controller.h b/chrome/browser/ui/cocoa/tabs/side_tab_strip_controller.h
index 07f5551..bd52ad9 100644
--- a/chrome/browser/ui/cocoa/side_tab_strip_controller.h
+++ b/chrome/browser/ui/cocoa/tabs/side_tab_strip_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 
 // A controller for the tab strip when side tabs are enabled.
 //
diff --git a/chrome/browser/ui/cocoa/side_tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/side_tab_strip_controller.mm
index 16a835f..80c3a15 100644
--- a/chrome/browser/ui/cocoa/side_tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/side_tab_strip_controller.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/side_tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/side_tab_strip_controller.h"
 
 @implementation SideTabStripController
 
diff --git a/chrome/browser/ui/cocoa/side_tab_strip_view.h b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view.h
index 9f8d056..8128f7f 100644
--- a/chrome/browser/ui/cocoa/side_tab_strip_view.h
+++ b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "chrome/browser/ui/cocoa/tab_strip_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 
 // A class that handles drawing the background of the tab strip when side tabs
 // are enabled.
diff --git a/chrome/browser/ui/cocoa/side_tab_strip_view.mm b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view.mm
index 2c60604..80cefc1 100644
--- a/chrome/browser/ui/cocoa/side_tab_strip_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/side_tab_strip_view.h"
+#import "chrome/browser/ui/cocoa/tabs/side_tab_strip_view.h"
 
 #include "base/scoped_nsobject.h"
 #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"
diff --git a/chrome/browser/ui/cocoa/side_tab_strip_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view_unittest.mm
index ba7acc2..1cc5572 100644
--- a/chrome/browser/ui/cocoa/side_tab_strip_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view_unittest.mm
@@ -5,7 +5,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/side_tab_strip_view.h"
+#import "chrome/browser/ui/cocoa/tabs/side_tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/tab_controller.h b/chrome/browser/ui/cocoa/tabs/tab_controller.h
index 8ed49eb..581b82c 100644
--- a/chrome/browser/ui/cocoa/tab_controller.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_controller.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 CHROME_BROWSER_UI_COCOA_TAB_CONTROLLER_H_
-#define CHROME_BROWSER_UI_COCOA_TAB_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_CONTROLLER_H_
+#define CHROME_BROWSER_UI_COCOA_TABS_TAB_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -112,4 +112,4 @@ class MenuDelegate;
 - (BOOL)shouldShowCloseButton;
 @end  // TabController(TestingAPI)
 
-#endif  // CHROME_BROWSER_UI_COCOA_TAB_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TABS_TAB_CONTROLLER_H_
diff --git a/chrome/browser/ui/cocoa/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm
index fb8c6b1..518ef21 100644
--- a/chrome/browser/ui/cocoa/tab_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm
@@ -6,9 +6,9 @@
 #include "base/mac/mac_util.h"
 #import "chrome/browser/themes/browser_theme_provider.h"
 #import "chrome/browser/ui/cocoa/menu_controller.h"
-#import "chrome/browser/ui/cocoa/tab_controller.h"
-#import "chrome/browser/ui/cocoa/tab_controller_target.h"
-#import "chrome/browser/ui/cocoa/tab_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/common/extensions/extension.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/cocoa/tab_controller_target.h b/chrome/browser/ui/cocoa/tabs/tab_controller_target.h
index 6eec01a..7044552 100644
--- a/chrome/browser/ui/cocoa/tab_controller_target.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_controller_target.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 CHROME_BROWSER_UI_COCOA_TAB_CONTROLLER_TARGET_H_
-#define CHROME_BROWSER_UI_COCOA_TAB_CONTROLLER_TARGET_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_CONTROLLER_TARGET_H_
+#define CHROME_BROWSER_UI_COCOA_TABS_TAB_CONTROLLER_TARGET_H_
 #pragma once
 
 #include "chrome/browser/tabs/tab_strip_model.h"
@@ -24,4 +24,4 @@
            forController:(TabController*)controller;
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_TAB_CONTROLLER_TARGET_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TABS_TAB_CONTROLLER_TARGET_H_
diff --git a/chrome/browser/ui/cocoa/tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm
index 93331ac..ef49850 100644
--- a/chrome/browser/ui/cocoa/tab_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm
@@ -5,9 +5,9 @@
 #import <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/tab_controller.h"
-#import "chrome/browser/ui/cocoa/tab_controller_target.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/tab_strip_controller.h b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
index 1dda86c..8dc4bd8 100644
--- a/chrome/browser/ui/cocoa/tab_strip_controller.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.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 CHROME_BROWSER_UI_COCOA_TAB_STRIP_CONTROLLER_H_
-#define CHROME_BROWSER_UI_COCOA_TAB_STRIP_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_
+#define CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -11,7 +11,7 @@
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/tab_contents_controller.h"
-#import "chrome/browser/ui/cocoa/tab_controller_target.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #import "third_party/GTM/AppKit/GTMWindowSheetController.h"
 
@@ -259,4 +259,4 @@ class ToolbarModel;
 // controller.
 extern NSString* const kTabStripNumberOfTabsChanged;
 
-#endif  // CHROME_BROWSER_UI_COCOA_TAB_STRIP_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_
diff --git a/chrome/browser/ui/cocoa/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 3165dcc..e16ba08 100644
--- a/chrome/browser/ui/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
@@ -34,12 +34,12 @@
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/constrained_window_mac.h"
 #import "chrome/browser/ui/cocoa/new_tab_button.h"
-#import "chrome/browser/ui/cocoa/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/tab_contents_controller.h"
-#import "chrome/browser/ui/cocoa/tab_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.h"
-#import "chrome/browser/ui/cocoa/tab_view.h"
-#import "chrome/browser/ui/cocoa/throbber_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_view.h"
+#import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
diff --git a/chrome/browser/ui/cocoa/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
index 189e57b..605da57 100644
--- a/chrome/browser/ui/cocoa/tab_strip_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
@@ -10,8 +10,8 @@
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/new_tab_button.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.h b/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h
index f3ff14e..111e7f9 100644
--- a/chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.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 CHROME_BROWSER_UI_COCOA_TAB_STRIP_MODEL_OBSERVER_BRIDGE_H_
-#define CHROME_BROWSER_UI_COCOA_TAB_STRIP_MODEL_OBSERVER_BRIDGE_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_MODEL_OBSERVER_BRIDGE_H_
+#define CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_MODEL_OBSERVER_BRIDGE_H_
 #pragma once
 
 #import <Foundation/Foundation.h>
@@ -83,4 +83,4 @@ class TabStripModelObserverBridge : public TabStripModelObserver {
 - (void)tabStripModelDeleted;
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_TAB_STRIP_MODEL_OBSERVER_BRIDGE_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_MODEL_OBSERVER_BRIDGE_H_
diff --git a/chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.mm
index 8d1679a..8e56296 100644
--- a/chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.mm
@@ -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 "chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.h"
+#include "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 
 #include "chrome/browser/tabs/tab_strip_model.h"
 
diff --git a/chrome/browser/ui/cocoa/tab_strip_view.h b/chrome/browser/ui/cocoa/tabs/tab_strip_view.h
index f504ff4..704136e 100644
--- a/chrome/browser/ui/cocoa/tab_strip_view.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_view.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 CHROME_BROWSER_UI_COCOA_TAB_STRIP_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_TAB_STRIP_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_VIEW_H_
+#define CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_VIEW_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -45,4 +45,4 @@
 - (BOOL)doubleClickMinimizesWindow;
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_TAB_STRIP_VIEW_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_VIEW_H_
diff --git a/chrome/browser/ui/cocoa/tab_strip_view.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
index 857da65..a8a15a4 100644
--- a/chrome/browser/ui/cocoa/tab_strip_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/tab_strip_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 
 @implementation TabStripView
diff --git a/chrome/browser/ui/cocoa/tab_strip_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_view_unittest.mm
index 2fde99ce..349774b 100644
--- a/chrome/browser/ui/cocoa/tab_strip_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_view_unittest.mm
@@ -5,8 +5,8 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/chrome/browser/ui/cocoa/tab_view.h b/chrome/browser/ui/cocoa/tabs/tab_view.h
index f351650..8cca958 100644
--- a/chrome/browser/ui/cocoa/tab_view.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_view.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 CHROME_BROWSER_UI_COCOA_TAB_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_TAB_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_VIEW_H_
+#define CHROME_BROWSER_UI_COCOA_TABS_TAB_VIEW_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -131,4 +131,4 @@ enum AlertState {
 - (void)setController:(TabController*)controller;
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_TAB_VIEW_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TABS_TAB_VIEW_H_
diff --git a/chrome/browser/ui/cocoa/tab_view.mm b/chrome/browser/ui/cocoa/tabs/tab_view.mm
index 0a655ad..d5a2de2 100644
--- a/chrome/browser/ui/cocoa/tab_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_view.mm
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/tab_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "chrome/browser/accessibility/browser_accessibility_state.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
-#import "chrome/browser/ui/cocoa/tab_controller.h"
-#import "chrome/browser/ui/cocoa/tab_window_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/ui/cocoa/tab_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_view_unittest.mm
index 961c3a6..548dd0f 100644
--- a/chrome/browser/ui/cocoa/tab_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_view_unittest.mm
@@ -5,8 +5,8 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/tab_view.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/chrome/browser/ui/cocoa/tab_window_controller.h b/chrome/browser/ui/cocoa/tabs/tab_window_controller.h
index ea3527c..db4092e 100644
--- a/chrome/browser/ui/cocoa/tab_window_controller.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.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 CHROME_BROWSER_UI_COCOA_TAB_WINDOW_CONTROLLER_H_
-#define CHROME_BROWSER_UI_COCOA_TAB_WINDOW_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_WINDOW_CONTROLLER_H_
+#define CHROME_BROWSER_UI_COCOA_TABS_TAB_WINDOW_CONTROLLER_H_
 #pragma once
 
 // A class acting as the Objective-C window controller for a window that has
@@ -177,4 +177,4 @@
 - (void)layoutSubviews;
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_TAB_WINDOW_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TABS_TAB_WINDOW_CONTROLLER_H_
diff --git a/chrome/browser/ui/cocoa/tab_window_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
index c3de82f..25d8468 100644
--- a/chrome/browser/ui/cocoa/tab_window_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/tab_window_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 
 #include "app/theme_provider.h"
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/focus_tracker.h"
-#import "chrome/browser/ui/cocoa/tab_strip_view.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 
 @interface TabWindowController(PRIVATE)
diff --git a/chrome/browser/ui/cocoa/throbber_view.h b/chrome/browser/ui/cocoa/tabs/throbber_view.h
index a680222..6cbd9f8 100644
--- a/chrome/browser/ui/cocoa/throbber_view.h
+++ b/chrome/browser/ui/cocoa/tabs/throbber_view.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 CHROME_BROWSER_UI_COCOA_THROBBER_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_THROBBER_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TABS_THROBBER_VIEW_H_
+#define CHROME_BROWSER_UI_COCOA_TABS_THROBBER_VIEW_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -39,4 +39,4 @@
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_THROBBER_VIEW_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TABS_THROBBER_VIEW_H_
diff --git a/chrome/browser/ui/cocoa/throbber_view.mm b/chrome/browser/ui/cocoa/tabs/throbber_view.mm
index c0e5dd3..29cc6df 100644
--- a/chrome/browser/ui/cocoa/throbber_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/throbber_view.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/throbber_view.h"
+#import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
 
 #include <set>
 
diff --git a/chrome/browser/ui/cocoa/throbber_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm
index b1a2ce4..18da43d 100644
--- a/chrome/browser/ui/cocoa/throbber_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm
@@ -6,7 +6,7 @@
 
 #include "app/resource_bundle.h"
 #include "base/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/throbber_view.h"
+#import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/view_id_util.mm b/chrome/browser/ui/cocoa/view_id_util.mm
index ea0e859..f3396a9 100644
--- a/chrome/browser/ui/cocoa/view_id_util.mm
+++ b/chrome/browser/ui/cocoa/view_id_util.mm
@@ -12,7 +12,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/tab_strip_controller.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 
 namespace {
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6c20c76..2c5c310 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2985,10 +2985,6 @@
         'browser/ui/cocoa/search_engine_dialog_controller.h',
         'browser/ui/cocoa/search_engine_dialog_controller.mm',
         'browser/ui/cocoa/shell_dialogs_mac.mm',
-        'browser/ui/cocoa/side_tab_strip_controller.h',
-        'browser/ui/cocoa/side_tab_strip_controller.mm',
-        'browser/ui/cocoa/side_tab_strip_view.h',
-        'browser/ui/cocoa/side_tab_strip_view.mm',
         'browser/ui/cocoa/sidebar_controller.h',
         'browser/ui/cocoa/sidebar_controller.mm',
         'browser/ui/cocoa/simple_content_exceptions_window_controller.h',
@@ -3008,20 +3004,26 @@
         'browser/ui/cocoa/styled_text_field_cell.mm',
         'browser/ui/cocoa/tab_contents_controller.h',
         'browser/ui/cocoa/tab_contents_controller.mm',
-        'browser/ui/cocoa/tab_controller.h',
-        'browser/ui/cocoa/tab_controller.mm',
-        'browser/ui/cocoa/tab_strip_controller.h',
-        'browser/ui/cocoa/tab_strip_controller.mm',
-        'browser/ui/cocoa/tab_strip_model_observer_bridge.h',
-        'browser/ui/cocoa/tab_strip_model_observer_bridge.mm',
-        'browser/ui/cocoa/tab_strip_view.h',
-        'browser/ui/cocoa/tab_strip_view.mm',
-        'browser/ui/cocoa/tab_view.h',
-        'browser/ui/cocoa/tab_view.mm',
+        'browser/ui/cocoa/tabs/side_tab_strip_controller.h',
+        'browser/ui/cocoa/tabs/side_tab_strip_controller.mm',
+        'browser/ui/cocoa/tabs/side_tab_strip_view.h',
+        'browser/ui/cocoa/tabs/side_tab_strip_view.mm',
+        'browser/ui/cocoa/tabs/tab_controller.h',
+        'browser/ui/cocoa/tabs/tab_controller.mm',
+        'browser/ui/cocoa/tabs/tab_strip_controller.h',
+        'browser/ui/cocoa/tabs/tab_strip_controller.mm',
+        'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h',
+        'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.mm',
+        'browser/ui/cocoa/tabs/tab_strip_view.h',
+        'browser/ui/cocoa/tabs/tab_strip_view.mm',
+        'browser/ui/cocoa/tabs/tab_view.h',
+        'browser/ui/cocoa/tabs/tab_view.mm',
+        'browser/ui/cocoa/tabs/tab_window_controller.h',
+        'browser/ui/cocoa/tabs/tab_window_controller.mm',
+        'browser/ui/cocoa/tabs/throbber_view.h',
+        'browser/ui/cocoa/tabs/throbber_view.mm',
         'browser/ui/cocoa/tab_view_picker_table.h',
         'browser/ui/cocoa/tab_view_picker_table.mm',
-        'browser/ui/cocoa/tab_window_controller.h',
-        'browser/ui/cocoa/tab_window_controller.mm',
         'browser/ui/cocoa/table_model_array_controller.h',
         'browser/ui/cocoa/table_model_array_controller.mm',
         'browser/ui/cocoa/table_row_nsimage_cache.h',
@@ -3036,8 +3038,6 @@
         'browser/ui/cocoa/themed_window.mm',
         'browser/ui/cocoa/theme_install_bubble_view.h',
         'browser/ui/cocoa/theme_install_bubble_view.mm',
-        'browser/ui/cocoa/throbber_view.h',
-        'browser/ui/cocoa/throbber_view.mm',
         'browser/ui/cocoa/toolbar_controller.h',
         'browser/ui/cocoa/toolbar_controller.mm',
         'browser/ui/cocoa/toolbar_view.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9b9a2e6..588556a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1561,7 +1561,6 @@
         'browser/ui/cocoa/rwhvm_editcommand_helper_unittest.mm',
         'browser/ui/cocoa/sad_tab_controller_unittest.mm',
         'browser/ui/cocoa/sad_tab_view_unittest.mm',
-        'browser/ui/cocoa/side_tab_strip_view_unittest.mm',
         'browser/ui/cocoa/simple_content_exceptions_window_controller_unittest.mm',
         'browser/ui/cocoa/status_bubble_mac_unittest.mm',
         'browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm',
@@ -1569,10 +1568,12 @@
         'browser/ui/cocoa/styled_text_field_test_helper.h',
         'browser/ui/cocoa/styled_text_field_test_helper.mm',
         'browser/ui/cocoa/styled_text_field_unittest.mm',
-        'browser/ui/cocoa/tab_controller_unittest.mm',
-        'browser/ui/cocoa/tab_strip_controller_unittest.mm',
-        'browser/ui/cocoa/tab_strip_view_unittest.mm',
-        'browser/ui/cocoa/tab_view_unittest.mm',
+        'browser/ui/cocoa/tabs/side_tab_strip_view_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_controller_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_strip_view_unittest.mm',
+        'browser/ui/cocoa/tabs/tab_view_unittest.mm',
+        'browser/ui/cocoa/tabs/throbber_view_unittest.mm',
         'browser/ui/cocoa/tab_view_picker_table_unittest.mm',
         'browser/ui/cocoa/table_model_array_controller_unittest.mm',
         'browser/ui/cocoa/table_row_nsimage_cache_unittest.mm',
@@ -1580,7 +1581,6 @@
         'browser/ui/cocoa/task_manager_mac_unittest.mm',
         'browser/ui/cocoa/test_event_utils.h',
         'browser/ui/cocoa/test_event_utils.mm',
-        'browser/ui/cocoa/throbber_view_unittest.mm',
         'browser/ui/cocoa/toolbar_controller_unittest.mm',
         'browser/ui/cocoa/toolbar_view_unittest.mm',
         'browser/ui/cocoa/translate/translate_infobar_unittest.mm',