16 files changed, 90 insertions, 86 deletions
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index c3ad1ba..f560330 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -1683,57 +1683,9 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Tab Strip"
+			Name="Tabs"
 			>
 			<File
-				RelativePath=".\tabs\dragged_tab_controller.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\dragged_tab_controller.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\dragged_tab_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\dragged_tab_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\hwnd_photobooth.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\hwnd_photobooth.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\tab.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\tab.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\tab_renderer.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\tab_renderer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\tab_strip.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\tabs\tab_strip.h"
-				>
-			</File>
-			<File
 				RelativePath=".\tabs\tab_strip_model.cc"
 				>
 			</File>
diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj
index 1b4f0d0..d7072d7 100644
--- a/chrome/browser/views/browser_views.vcproj
+++ b/chrome/browser/views/browser_views.vcproj
@@ -329,6 +329,58 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Tabs"
+			>
+			<File
+				RelativePath=".\tabs\dragged_tab_controller.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\dragged_tab_controller.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\dragged_tab_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\dragged_tab_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\hwnd_photobooth.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\hwnd_photobooth.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\tab.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\tab.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\tab_renderer.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\tab_renderer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\tab_strip.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tabs\tab_strip.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\about_chrome_view.cc"
 			>
diff --git a/chrome/browser/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index 80cbe65..81b5386 100644
--- a/chrome/browser/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/tabs/dragged_tab_controller.h"
-
 #include <math.h>
 
+#include "chrome/browser/views/tabs/dragged_tab_controller.h"
+
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/frame_util.h"
 #include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tabs/dragged_tab_view.h"
-#include "chrome/browser/tabs/hwnd_photobooth.h"
-#include "chrome/browser/tabs/tab.h"
-#include "chrome/browser/tabs/tab_strip.h"
+#include "chrome/browser/views/tabs/dragged_tab_view.h"
+#include "chrome/browser/views/tabs/hwnd_photobooth.h"
+#include "chrome/browser/views/tabs/tab.h"
+#include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/web_contents.h"
 #include "chrome/views/event.h"
 #include "chrome/views/root_view.h"
diff --git a/chrome/browser/tabs/dragged_tab_controller.h b/chrome/browser/views/tabs/dragged_tab_controller.h
index 031a6ed..6c6aed6 100644
--- a/chrome/browser/tabs/dragged_tab_controller.h
+++ b/chrome/browser/views/tabs/dragged_tab_controller.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_TABS_DRAGGED_TAB_CONTROLLER_H_
-#define CHROME_BROWSER_TABS_DRAGGED_TAB_CONTROLLER_H_
+#ifndef CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
+#define CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
 
 #include "base/gfx/rect.h"
 #include "base/message_loop.h"
 #include "chrome/browser/tab_contents_delegate.h"
-#include "chrome/browser/tabs/tab_renderer.h"
+#include "chrome/browser/views/tabs/tab_renderer.h"
 #include "chrome/common/notification_service.h"
 
 namespace ChromeViews {
@@ -282,5 +282,5 @@ class DraggedTabController : public TabContentsDelegate,
   DISALLOW_COPY_AND_ASSIGN(DraggedTabController);
 };
 
-#endif  // CHROME_BROWSER_TABS_DRAGGED_TAB_CONTROLLER_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
 
diff --git a/chrome/browser/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc
index 0878476..6e3fead 100644
--- a/chrome/browser/tabs/dragged_tab_view.cc
+++ b/chrome/browser/views/tabs/dragged_tab_view.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/tabs/dragged_tab_view.h"
+#include "chrome/browser/views/tabs/dragged_tab_view.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tabs/hwnd_photobooth.h"
-#include "chrome/browser/tabs/tab_renderer.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/views/tabs/hwnd_photobooth.h"
+#include "chrome/browser/views/tabs/tab_renderer.h"
 #include "chrome/views/hwnd_view_container.h"
 #include "skia/include/SkShader.h"
 
diff --git a/chrome/browser/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h
index 8419342..e59582c 100644
--- a/chrome/browser/tabs/dragged_tab_view.h
+++ b/chrome/browser/views/tabs/dragged_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_TABS_DRAGGED_TAB_VIEW_H_
-#define CHROME_BROWSER_TABS_DRAGGED_TAB_VIEW_H_
+#ifndef CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_
+#define CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_
 
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
@@ -115,5 +115,5 @@ class DraggedTabView : public ChromeViews::View,
   DISALLOW_EVIL_CONSTRUCTORS(DraggedTabView);
 };
 
-#endif  // CHROME_BROWSER_TABS_DRAGGED_TAB_VIEW_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_
 
diff --git a/chrome/browser/tabs/hwnd_photobooth.cc b/chrome/browser/views/tabs/hwnd_photobooth.cc
index 7ae6c69..a230c6b 100644
--- a/chrome/browser/tabs/hwnd_photobooth.cc
+++ b/chrome/browser/views/tabs/hwnd_photobooth.cc
@@ -4,7 +4,7 @@
 
 #include "base/gfx/point.h"
 #include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tabs/hwnd_photobooth.h"
+#include "chrome/browser/views/tabs/hwnd_photobooth.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/hwnd_view_container.h"
 #include "skia/include/SkBitmap.h"
diff --git a/chrome/browser/tabs/hwnd_photobooth.h b/chrome/browser/views/tabs/hwnd_photobooth.h
index 608236b..4de1d14 100644
--- a/chrome/browser/tabs/hwnd_photobooth.h
+++ b/chrome/browser/views/tabs/hwnd_photobooth.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_HWND_PHOTOBOOTH_H__
-#define CHROME_BROWSER_HWND_PHOTOBOOTH_H__
+#ifndef CHROME_BROWSER_VIEWS_TABS_HWND_PHOTOBOOTH_H__
+#define CHROME_BROWSER_VIEWS_TABS_HWND_PHOTOBOOTH_H__
 
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
@@ -58,5 +58,5 @@ class HWNDPhotobooth {
   DISALLOW_EVIL_CONSTRUCTORS(HWNDPhotobooth);
 };
 
-#endif  // #ifndef CHROME_BROWSER_HWND_PHOTOBOOTH_H__
+#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_HWND_PHOTOBOOTH_H__
 
diff --git a/chrome/browser/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index f855701..bf5dc89 100644
--- a/chrome/browser/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.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 "chrome/browser/tabs/tab.h"
+#include "chrome/browser/views/tabs/tab.h"
 
 #include "base/gfx/size.h"
 #include "chrome/views/view_container.h"
diff --git a/chrome/browser/tabs/tab.h b/chrome/browser/views/tabs/tab.h
index 10346ef..753e1a9 100644
--- a/chrome/browser/tabs/tab.h
+++ b/chrome/browser/views/tabs/tab.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 CHROME_BROWSER_TABS_TAB_H_
-#define CHROME_BROWSER_TABS_TAB_H_
+#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_H_
+#define CHROME_BROWSER_VIEWS_TABS_TAB_H_
 
-#include "chrome/browser/tabs/tab_renderer.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/views/tabs/tab_renderer.h"
 #include "chrome/views/base_button.h"
 
 namespace gfx {
@@ -121,5 +121,5 @@ class Tab : public TabRenderer,
   DISALLOW_COPY_AND_ASSIGN(Tab);
 };
 
-#endif  // CHROME_BROWSER_TABS_TAB_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_TAB_H_
 
diff --git a/chrome/browser/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index 631a0f0..631a0f0 100644
--- a/chrome/browser/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
diff --git a/chrome/browser/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index 3437900..d7509ab 100644
--- a/chrome/browser/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -4,7 +4,7 @@
 
 #include <limits>
 
-#include "chrome/browser/tabs/tab_renderer.h"
+#include "chrome/browser/views/tabs/tab_renderer.h"
 
 #include "base/gfx/image_operations.h"
 #include "chrome/app/theme/theme_resources.h"
diff --git a/chrome/browser/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h
index 25c2de8..cb92574 100644
--- a/chrome/browser/tabs/tab_renderer.h
+++ b/chrome/browser/views/tabs/tab_renderer.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_TABS_TAB_RENDERER_H__
-#define CHROME_BROWSER_TABS_TAB_RENDERER_H__
+#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
+#define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
 
 #include "base/gfx/point.h"
 #include "chrome/common/animation.h"
@@ -170,5 +170,5 @@ class TabRenderer : public ChromeViews::View,
   DISALLOW_EVIL_CONSTRUCTORS(TabRenderer);
 };
 
-#endif  // CHROME_BROWSER_TABS_TAB_RENDERER_H__
+#endif  // CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
 
diff --git a/chrome/browser/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 57a8e32..2b8dc61 100644
--- a/chrome/browser/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/tabs/tab_strip.h"
+#include "chrome/browser/views/tabs/tab_strip.h"
 
 #include "base/gfx/size.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tabs/dragged_tab_controller.h"
-#include "chrome/browser/tabs/tab.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/view_ids.h"
+#include "chrome/browser/views/tabs/dragged_tab_controller.h"
+#include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/vista_frame.h"
 #include "chrome/browser/web_contents.h"
 #include "chrome/common/drag_drop_types.h"
diff --git a/chrome/browser/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h
index 11f6f64..656dd12 100644
--- a/chrome/browser/tabs/tab_strip.h
+++ b/chrome/browser/views/tabs/tab_strip.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 CHROME_BROWSER_TABS_TAB_STRIP_H__
-#define CHROME_BROWSER_TABS_TAB_STRIP_H__
+#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H__
+#define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H__
 
 #include "base/gfx/point.h"
-#include "chrome/browser/tabs/tab.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/views/tabs/tab.h"
 #include "chrome/views/button.h"
 #include "chrome/views/hwnd_view_container.h"
 #include "chrome/views/menu.h"
@@ -369,5 +369,5 @@ class TabStrip : public ChromeViews::View,
   DISALLOW_EVIL_CONSTRUCTORS(TabStrip);
 };
 
-#endif  // CHROME_BROWSER_TABS_TAB_STRIP_H__
+#endif  // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H__
 
diff --git a/chrome/test/interactive_ui/interactive_ui.vcproj b/chrome/test/interactive_ui/interactive_ui.vcproj
index 5449a05..3405e29 100644
--- a/chrome/test/interactive_ui/interactive_ui.vcproj
+++ b/chrome/test/interactive_ui/interactive_ui.vcproj
@@ -227,7 +227,7 @@
 			Name="TestTabDragging"
 			>
 			<File
-				RelativePath="..\..\browser\tabs\tab_dragging_test.cc"
+				RelativePath="..\..\browser\views\tabs\tab_dragging_test.cc"
 				>
 			</File>
 		</Filter>