[Mac] Organize some files into chrome/browser/ui/cocoa/tab_contents/.

BUG=none
TEST=compiles
R=pinkerton
Review URL: http://codereview.chromium.org/6358008

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

30 files changed, 61 insertions, 59 deletions

diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index e8fbab6..10cd690 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -19,9 +19,9 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #import "chrome/browser/ui/cocoa/focus_tracker.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#include "chrome/browser/ui/cocoa/sad_tab_controller.h"
-#import "chrome/browser/ui/cocoa/web_drag_source.h"
-#import "chrome/browser/ui/cocoa/web_drop_target.h"
+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/web_drag_source.h"
+#import "chrome/browser/ui/cocoa/tab_contents/web_drop_target.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #import "chrome/common/chrome_application_mac.h"
 #include "chrome/common/notification_details.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_source.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_source.h
index 53d4361..c3ab0a5 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_source.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_source.h
@@ -5,7 +5,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
-#include "chrome/browser/ui/cocoa/web_contents_drag_source.h"
+#include "chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.h"
 
 // A class that handles tracking and event processing for a drag and drop
 // originating from the content area.
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h
index 51424be..0820217 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.h
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h
@@ -19,7 +19,7 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #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_contents/tab_contents_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"
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index c421b56..38c0974 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -41,11 +41,11 @@
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
-#import "chrome/browser/ui/cocoa/previewable_contents_controller.h"
-#import "chrome/browser/ui/cocoa/sad_tab_controller.h"
 #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_contents/previewable_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/tab_contents_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/tabs/tab_view.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 73c6e01..813d51e 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -18,7 +18,7 @@
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
 #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/tab_contents/previewable_contents_controller.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"
diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.h b/chrome/browser/ui/cocoa/dev_tools_controller.h
index c89a9f8..a976884 100644
--- a/chrome/browser/ui/cocoa/dev_tools_controller.h
+++ b/chrome/browser/ui/cocoa/dev_tools_controller.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 
 #include "base/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/tab_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 
 @class NSSplitView;
 @class NSView;
diff --git a/chrome/browser/ui/cocoa/sidebar_controller.h b/chrome/browser/ui/cocoa/sidebar_controller.h
index dcafddb..65955d5 100644
--- a/chrome/browser/ui/cocoa/sidebar_controller.h
+++ b/chrome/browser/ui/cocoa/sidebar_controller.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 
 #include "base/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/tab_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 
 @class NSSplitView;
 @class NSView;
diff --git a/chrome/browser/ui/cocoa/tab_contents/OWNERS b/chrome/browser/ui/cocoa/tab_contents/OWNERS
new file mode 100644
index 0000000..377ad51
--- /dev/null
+++ b/chrome/browser/ui/cocoa/tab_contents/OWNERS
@@ -0,0 +1,3 @@
+avi@chromium.org
+pinkerton@chromium.org
+thakis@chromium.org
diff --git a/chrome/browser/ui/cocoa/previewable_contents_controller.h b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h
index 01643f0..215d096 100644
--- a/chrome/browser/ui/cocoa/previewable_contents_controller.h
+++ b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_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_PREVIEWABLE_CONTENTS_CONTROLLER_H_
-#define CHROME_BROWSER_UI_COCOA_PREVIEWABLE_CONTENTS_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_PREVIEWABLE_CONTENTS_CONTROLLER_H_
+#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_PREVIEWABLE_CONTENTS_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -44,4 +44,4 @@ class TabContents;
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_PREVIEWABLE_CONTENTS_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_PREVIEWABLE_CONTENTS_CONTROLLER_H_
diff --git a/chrome/browser/ui/cocoa/previewable_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.mm
index 74e29b0..08aa315 100644
--- a/chrome/browser/ui/cocoa/previewable_contents_controller.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_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/previewable_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
diff --git a/chrome/browser/ui/cocoa/previewable_contents_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm
index a2d9263..3e5ea6f 100644
--- a/chrome/browser/ui/cocoa/previewable_contents_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm
@@ -7,7 +7,7 @@
 #import "base/scoped_nsobject.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/previewable_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/chrome/browser/ui/cocoa/sad_tab_controller.h b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h
index 35e9aaf..48a97f6 100644
--- a/chrome/browser/ui/cocoa/sad_tab_controller.h
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_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_SAD_TAB_CONTROLLER_H_
-#define CHROME_BROWSER_UI_COCOA_SAD_TAB_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_CONTROLLER_H_
+#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -30,4 +30,4 @@ class TabContents;
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_SAD_TAB_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_CONTROLLER_H_
diff --git a/chrome/browser/ui/cocoa/sad_tab_controller.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm
index e340a9c..3b11c14 100644
--- a/chrome/browser/ui/cocoa/sad_tab_controller.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm
@@ -2,10 +2,10 @@
 // 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/sad_tab_controller.h"
+#include "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
 
 #include "base/mac/mac_util.h"
-#import "chrome/browser/ui/cocoa/sad_tab_view.h"
+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h"
 
 @implementation SadTabController
 
diff --git a/chrome/browser/ui/cocoa/sad_tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm
index 15839a8..84276a3 100644
--- a/chrome/browser/ui/cocoa/sad_tab_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm
@@ -5,8 +5,8 @@
 #include "base/debug/debugger.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/sad_tab_controller.h"
-#import "chrome/browser/ui/cocoa/sad_tab_view.h"
+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/ui/cocoa/sad_tab_view.h b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h
index 0f304eb..8f782af 100644
--- a/chrome/browser/ui/cocoa/sad_tab_view.h
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_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_SAD_TAB_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_SAD_TAB_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_H_
+#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_H_
 #pragma once
 
 #include "base/scoped_nsobject.h"
@@ -33,4 +33,4 @@
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_SAD_TAB_VIEW_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_H_
diff --git a/chrome/browser/ui/cocoa/sad_tab_view.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm
index 64ec7f6..666ebff 100644
--- a/chrome/browser/ui/cocoa/sad_tab_view.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_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.
 
-#include "chrome/browser/ui/cocoa/sad_tab_view.h"
+#include "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h"
 
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
diff --git a/chrome/browser/ui/cocoa/sad_tab_view_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm
index 2321dd3..76808cf 100644
--- a/chrome/browser/ui/cocoa/sad_tab_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_unittest.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/sad_tab_view.h"
+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 
 namespace {
diff --git a/chrome/browser/ui/cocoa/tab_contents_controller.h b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h
index f821ea4..a327e4b 100644
--- a/chrome/browser/ui/cocoa/tab_contents_controller.h
+++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_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_CONTENTS_CONTROLLER_H_
-#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_TAB_CONTENTS_CONTROLLER_H_
+#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_TAB_CONTENTS_CONTROLLER_H_
 #pragma once
 
 #include <Cocoa/Cocoa.h>
@@ -72,4 +72,4 @@ class TabContentsNotificationBridge;
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_TAB_CONTENTS_CONTROLLER_H_
diff --git a/chrome/browser/ui/cocoa/tab_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
index f710755..68f8d07 100644
--- a/chrome/browser/ui/cocoa/tab_contents_controller.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_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_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/ui/cocoa/web_contents_drag_source.h b/chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.h
index aa9dd73..e611f4c 100644
--- a/chrome/browser/ui/cocoa/web_contents_drag_source.h
+++ b/chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.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_WEB_CONTENTS_DRAG_SOURCE_H_
-#define CHROME_BROWSER_UI_COCOA_WEB_CONTENTS_DRAG_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_WEB_CONTENTS_DRAG_SOURCE_H_
+#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_WEB_CONTENTS_DRAG_SOURCE_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -59,4 +59,4 @@
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_WEB_CONTENTS_DRAG_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_WEB_CONTENTS_DRAG_SOURCE_H_
diff --git a/chrome/browser/ui/cocoa/web_contents_drag_source.mm b/chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.mm
index 68cfcfd..318b6a0 100644
--- a/chrome/browser/ui/cocoa/web_contents_drag_source.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.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/web_contents_drag_source.h"
+#import "chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.h"
 
 #include "app/mac/nsimage_cache.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/ui/cocoa/web_drag_source.h b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.h
index 9cfcba5..9cfcba5 100644
--- a/chrome/browser/ui/cocoa/web_drag_source.h
+++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.h
diff --git a/chrome/browser/ui/cocoa/web_drag_source.mm b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm
index 9664211..66c8f44 100644
--- a/chrome/browser/ui/cocoa/web_drag_source.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.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/web_drag_source.h"
+#import "chrome/browser/ui/cocoa/tab_contents/web_drag_source.h"
 
 #include "app/mac/nsimage_cache.h"
 #include "base/file_path.h"
diff --git a/chrome/browser/ui/cocoa/web_drop_target.h b/chrome/browser/ui/cocoa/tab_contents/web_drop_target.h
index 7f18ccf..7f18ccf 100644
--- a/chrome/browser/ui/cocoa/web_drop_target.h
+++ b/chrome/browser/ui/cocoa/tab_contents/web_drop_target.h
diff --git a/chrome/browser/ui/cocoa/web_drop_target.mm b/chrome/browser/ui/cocoa/tab_contents/web_drop_target.mm
index 08174b5..af1226a 100644
--- a/chrome/browser/ui/cocoa/web_drop_target.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/web_drop_target.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/web_drop_target.h"
+#import "chrome/browser/ui/cocoa/tab_contents/web_drop_target.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
diff --git a/chrome/browser/ui/cocoa/web_drop_target_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/web_drop_target_unittest.mm
index 0261e89..c10e22c 100644
--- a/chrome/browser/ui/cocoa/web_drop_target_unittest.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/web_drop_target_unittest.mm
@@ -8,7 +8,7 @@
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/web_drop_target.h"
+#import "chrome/browser/ui/cocoa/tab_contents/web_drop_target.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "webkit/glue/webdropdata.h"
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
index 8dc4bd8..96a8e6b 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
@@ -10,7 +10,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_contents/tab_contents_controller.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"
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 755c8c9..e141939 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -32,7 +32,6 @@
 #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_contents_controller.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"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1797387..e0405df 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2970,18 +2970,12 @@
         'browser/ui/cocoa/options/search_engine_list_model.mm',
         'browser/ui/cocoa/page_info_bubble_controller.h',
         'browser/ui/cocoa/page_info_bubble_controller.mm',
-        'browser/ui/cocoa/previewable_contents_controller.h',
-        'browser/ui/cocoa/previewable_contents_controller.mm',
         'browser/ui/cocoa/repost_form_warning_mac.h',
         'browser/ui/cocoa/repost_form_warning_mac.mm',
         'browser/ui/cocoa/restart_browser.h',
         'browser/ui/cocoa/restart_browser.mm',
         'browser/ui/cocoa/rwhvm_editcommand_helper.h',
         'browser/ui/cocoa/rwhvm_editcommand_helper.mm',
-        'browser/ui/cocoa/sad_tab_controller.h',
-        'browser/ui/cocoa/sad_tab_controller.mm',
-        'browser/ui/cocoa/sad_tab_view.h',
-        'browser/ui/cocoa/sad_tab_view.mm',
         'browser/ui/cocoa/scoped_authorizationref.h',
         'browser/ui/cocoa/search_engine_dialog_controller.h',
         'browser/ui/cocoa/search_engine_dialog_controller.mm',
@@ -3001,8 +2995,20 @@
         'browser/ui/cocoa/styled_text_field.mm',
         'browser/ui/cocoa/styled_text_field_cell.h',
         '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_contents/previewable_contents_controller.h',
+        'browser/ui/cocoa/tab_contents/previewable_contents_controller.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_controller.h',
+        'browser/ui/cocoa/tab_contents/sad_tab_controller.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_view.h',
+        'browser/ui/cocoa/tab_contents/sad_tab_view.mm',
+        'browser/ui/cocoa/tab_contents/tab_contents_controller.h',
+        'browser/ui/cocoa/tab_contents/tab_contents_controller.mm',
+        'browser/ui/cocoa/tab_contents/web_contents_drag_source.h',
+        'browser/ui/cocoa/tab_contents/web_contents_drag_source.mm',
+        'browser/ui/cocoa/tab_contents/web_drag_source.h',
+        'browser/ui/cocoa/tab_contents/web_drag_source.mm',
+        'browser/ui/cocoa/tab_contents/web_drop_target.h',
+        'browser/ui/cocoa/tab_contents/web_drop_target.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',
@@ -3062,12 +3068,6 @@
         'browser/ui/cocoa/view_id_util.h',
         'browser/ui/cocoa/view_id_util.mm',
         'browser/ui/cocoa/view_resizer.h',
-        'browser/ui/cocoa/web_contents_drag_source.h',
-        'browser/ui/cocoa/web_contents_drag_source.mm',
-        'browser/ui/cocoa/web_drag_source.h',
-        'browser/ui/cocoa/web_drag_source.mm',
-        'browser/ui/cocoa/web_drop_target.h',
-        'browser/ui/cocoa/web_drop_target.mm',
         'browser/ui/cocoa/window_size_autosaver.h',
         'browser/ui/cocoa/window_size_autosaver.mm',
         'browser/ui/cocoa/wrench_menu/menu_tracked_button.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 56c23b4..e084780 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1554,16 +1554,17 @@
         'browser/ui/cocoa/options/preferences_window_controller_unittest.mm',
         'browser/ui/cocoa/options/search_engine_list_model_unittest.mm',
         'browser/ui/cocoa/page_info_bubble_controller_unittest.mm',
-        'browser/ui/cocoa/previewable_contents_controller_unittest.mm',
         '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/status_bubble_mac_unittest.mm',
         'browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm',
         'browser/ui/cocoa/styled_text_field_cell_unittest.mm',
         '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_contents/previewable_contents_controller_unittest.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm',
+        'browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm',
+        'browser/ui/cocoa/tab_contents/web_drop_target_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',
@@ -1584,7 +1585,6 @@
         'browser/ui/cocoa/vertical_gradient_view_unittest.mm',
         'browser/ui/cocoa/view_resizer_pong.h',
         'browser/ui/cocoa/view_resizer_pong.mm',
-        'browser/ui/cocoa/web_drop_target_unittest.mm',
         'browser/ui/cocoa/window_size_autosaver_unittest.mm',
         'browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm',
         'browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm',