Move TabContentsViewWin and RenderViewContextMenu*Win to browser/views/tab_contents

They are dependent on the views API (WidgetWin, Menu2, SadTabView, etc etc) so this makes sense.

As a follow-on step, I will create a new tab_contents_view_gtk.cc/h in browser/views/tab_contents as well, so TOOLKIT_VIEWS is not exposed to bustage introduced from the non-TOOLKIT_VIEWS version of this file as it is now. I cannot have two files called "tab_contents_view_gtk" in the same directory (browser/tab_contents). Mimicking TabContentsViewWin, TOOLKIT_VIEWS TabContentsViewGtk will subclass WidgetGtk, use browser/views/sad_tab_view and utilize RenderViewContextMenuWin which is now cross platform.

BUG=none
TEST=none

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

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

8 files changed, 18 insertions, 18 deletions

diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index 6c9b2a8..7da0be0 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/provisional_load_details.h"
-#include "chrome/browser/tab_contents/render_view_context_menu_external_win.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu_external_win.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tab_contents/tab_contents_container.h"
 #include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/tab_contents/render_view_context_menu_external_win.cc b/chrome/browser/views/tab_contents/render_view_context_menu_external_win.cc
index 83b88031..f7c1dd3 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_external_win.cc
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_external_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 "chrome/browser/tab_contents/render_view_context_menu_external_win.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu_external_win.h"
 
 #include <algorithm>
 
diff --git a/chrome/browser/tab_contents/render_view_context_menu_external_win.h b/chrome/browser/views/tab_contents/render_view_context_menu_external_win.h
index cee9418..368c70d 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_external_win.h
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_external_win.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "chrome/browser/tab_contents/render_view_context_menu_win.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu_win.h"
 
 // This class provides a facility for an external host to customize the context
 // menu displayed in Chrome.
diff --git a/chrome/browser/tab_contents/render_view_context_menu_win.cc b/chrome/browser/views/tab_contents/render_view_context_menu_win.cc
index 99f3346..8f31491 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_win.cc
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_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 "chrome/browser/tab_contents/render_view_context_menu_win.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu_win.h"
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/tab_contents/render_view_context_menu_win.h b/chrome/browser/views/tab_contents/render_view_context_menu_win.h
index e8311bc..1d4be70 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_win.h
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_win.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_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
-#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
+#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
+#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
@@ -61,4 +61,4 @@ class RenderViewContextMenuWin : public RenderViewContextMenu,
   ScopedVector<views::SimpleMenuModel> submenu_models_;
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
+#endif  // CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
diff --git a/chrome/browser/tab_contents/tab_contents_view_win.cc b/chrome/browser/views/tab_contents/tab_contents_view_win.cc
index 37e590d..edc48c8 100755
--- a/chrome/browser/tab_contents/tab_contents_view_win.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_view_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 "chrome/browser/tab_contents/tab_contents_view_win.h"
+#include "chrome/browser/views/tab_contents/tab_contents_view_win.h"
 
 #include <windows.h>
 
@@ -16,13 +16,13 @@
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
-#include "chrome/browser/tab_contents/render_view_context_menu_win.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/web_drag_source.h"
 #include "chrome/browser/tab_contents/web_drop_target.h"
 #include "chrome/browser/views/sad_tab_view.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu_win.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "views/focus/view_storage.h"
diff --git a/chrome/browser/tab_contents/tab_contents_view_win.h b/chrome/browser/views/tab_contents/tab_contents_view_win.h
index 6af85a1..236e237a 100644
--- a/chrome/browser/tab_contents/tab_contents_view_win.h
+++ b/chrome/browser/views/tab_contents/tab_contents_view_win.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_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
-#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
+#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
+#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
 
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
@@ -107,4 +107,4 @@ class TabContentsViewWin : public TabContentsView,
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewWin);
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
+#endif  // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index a2a8162..fc6bd74 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1358,10 +1358,6 @@
         'browser/tab_contents/render_view_context_menu_gtk.h',
         'browser/tab_contents/render_view_context_menu_mac.mm',
         'browser/tab_contents/render_view_context_menu_mac.h',
-        'browser/tab_contents/render_view_context_menu_win.cc',
-        'browser/tab_contents/render_view_context_menu_win.h',
-        'browser/tab_contents/render_view_context_menu_external_win.cc',
-        'browser/tab_contents/render_view_context_menu_external_win.h',
         'browser/tab_contents/render_view_host_delegate_helper.cc',
         'browser/tab_contents/render_view_host_delegate_helper.h',
         'browser/tab_contents/render_view_host_manager.cc',
@@ -1379,8 +1375,6 @@
         'browser/tab_contents/tab_contents_view_gtk.h',
         'browser/tab_contents/tab_contents_view_mac.h',
         'browser/tab_contents/tab_contents_view_mac.mm',
-        'browser/tab_contents/tab_contents_view_win.cc',
-        'browser/tab_contents/tab_contents_view_win.h',
         'browser/tab_contents/tab_util.cc',
         'browser/tab_contents/tab_util.h',
         'browser/tab_contents/web_drag_source.cc',
@@ -1573,6 +1567,12 @@
         'browser/views/tab_contents/native_tab_contents_container_gtk.h',
         'browser/views/tab_contents/native_tab_contents_container_win.cc',
         'browser/views/tab_contents/native_tab_contents_container_win.h',
+        'browser/views/tab_contents/render_view_context_menu_win.cc',
+        'browser/views/tab_contents/render_view_context_menu_win.h',
+        'browser/views/tab_contents/render_view_context_menu_external_win.cc',
+        'browser/views/tab_contents/render_view_context_menu_external_win.h',
+        'browser/views/tab_contents/tab_contents_view_win.cc',
+        'browser/views/tab_contents/tab_contents_view_win.h',                
         'browser/views/tabs/dragged_tab_controller.cc',
         'browser/views/tabs/dragged_tab_controller.h',
         'browser/views/tabs/dragged_tab_view.cc',