Attempt to fix the Linux Views and ChromiumOS builds following r38658.

chrome/browser/views/tab_contents/render_view_context_menu_win.cc appears to
be a views file, not a Windows file, so why is it named with _win.cc?  This is
a speculative change.

BUG=none
TEST=Linux Builder (Views dbg) and Linux Builder (ChromiumOS) compile steps
     turn green
Review URL: http://codereview.chromium.org/596040

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

6 files changed, 11 insertions, 11 deletions

diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_win.cc b/chrome/browser/views/tab_contents/render_view_context_menu.cc
index 9159da2..28d7cab 100644
--- a/chrome/browser/views/tab_contents/render_view_context_menu_win.cc
+++ b/chrome/browser/views/tab_contents/render_view_context_menu.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/views/tab_contents/render_view_context_menu_win.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu.h"
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_win.h b/chrome/browser/views/tab_contents/render_view_context_menu.h
index e719469..5d548bd 100644
--- a/chrome/browser/views/tab_contents/render_view_context_menu_win.h
+++ b/chrome/browser/views/tab_contents/render_view_context_menu.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_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
-#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
+#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_H_
+#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_H_
 
 #include "app/menus/simple_menu_model.h"
 #include "base/scoped_ptr.h"
@@ -61,4 +61,4 @@ class RenderViewContextMenuWin : public RenderViewContextMenu,
   ScopedVector<menus::SimpleMenuModel> submenu_models_;
 };
 
-#endif  // CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
+#endif  // CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_H_
diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_external_win.h b/chrome/browser/views/tab_contents/render_view_context_menu_external_win.h
index 6f5e5cb5..7c850138 100644
--- a/chrome/browser/views/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/views/tab_contents/render_view_context_menu_win.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu.h"
 
 // This class provides a facility for an external host to customize the context
 // menu displayed in Chrome.
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
index 9fb13b2..c58452d 100644
--- a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
@@ -24,7 +24,7 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h"
 #include "chrome/browser/views/sad_tab_view.h"
-#include "chrome/browser/views/tab_contents/render_view_context_menu_win.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/view_storage.h"
 #include "views/screen.h"
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/views/tab_contents/tab_contents_view_win.cc
index d1c3bfe..d7ca001 100644
--- a/chrome/browser/views/tab_contents/tab_contents_view_win.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_view_win.cc
@@ -24,7 +24,7 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/web_drop_target_win.h"
 #include "chrome/browser/views/sad_tab_view.h"
-#include "chrome/browser/views/tab_contents/render_view_context_menu_win.h"
+#include "chrome/browser/views/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/views/tab_contents/tab_contents_drag_win.h"
 #include "views/focus/view_storage.h"
 #include "views/screen.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6a82e74..aed3ad6 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2010,8 +2010,8 @@
         '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.cc',
+        'browser/views/tab_contents/render_view_context_menu.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_drag_win.cc',
@@ -2519,8 +2519,8 @@
                 ['include', '^browser/views/status_bubble_views.h'],
                 ['include', '^browser/views/tab_contents/native_tab_contents_container_gtk.cc'],
                 ['include', '^browser/views/tab_contents/native_tab_contents_container_gtk.h'],
-                ['include', 'browser/views/tab_contents/render_view_context_menu_win\.cc$'],
-                ['include', 'browser/views/tab_contents/render_view_context_menu_win\.h$'],
+                ['include', '^browser/views/tab_contents/render_view_context_menu.cc'],
+                ['include', '^browser/views/tab_contents/render_view_context_menu.h'],
                 ['include', '^browser/views/tab_contents/tab_contents_container.cc'],
                 ['include', '^browser/views/tab_contents/tab_contents_container.h'],
                 ['include', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],