diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 01:58:52 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 01:58:52 +0000 |
commit | 51c3781cd4e4a0040d1fff6927c993f3b96f487b (patch) | |
tree | 3ee10b0f6f1928980b5e86fb6c1e1dd3bb91bcc1 | |
parent | 3d0d7f26c83a2f11a66864bfb28256d538b09e06 (diff) | |
download | chromium_src-51c3781cd4e4a0040d1fff6927c993f3b96f487b.zip chromium_src-51c3781cd4e4a0040d1fff6927c993f3b96f487b.tar.gz chromium_src-51c3781cd4e4a0040d1fff6927c993f3b96f487b.tar.bz2 |
browser: Move render_view_context_menu implementations into their specific platform directories.
This allow us to move render_view_context_menu_win.* to views/, and thus
removing a dependency in views/ from chrome/browser/tab_contents.
BUG=125846
R=ben@chromium.org
TBR=sky@chromium.org,erg@chromium.org,rsesek@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10626011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143511 0039d316-1c4b-4281-b951-d872f2087c98
10 files changed, 21 insertions, 21 deletions
diff --git a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm index c3502f3..1086232 100644 --- a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm +++ b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm @@ -5,8 +5,8 @@ #import "chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h" #import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.h" -#include "chrome/browser/tab_contents/render_view_context_menu_mac.h" #include "chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h" +#include "chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h" #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_mac.h b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h index a524ffc..1ae7c74 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_mac.h +++ b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.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_MAC_H_ -#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_MAC_H_ +#ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_MAC_H_ +#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_MAC_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -67,4 +67,4 @@ class RenderViewContextMenuMac : public RenderViewContextMenu { DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuMac); }; -#endif // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_MAC_H_ +#endif // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_MAC_H_ diff --git a/chrome/browser/tab_contents/render_view_context_menu_mac.mm b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm index e1fc8ee..3fbf97b 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_mac.mm +++ b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.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/tab_contents/render_view_context_menu_mac.h" +#include "chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h" #include "base/compiler_specific.h" #import "base/mac/scoped_sending_event.h" diff --git a/chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc b/chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc index 19cd674..c7d7d26 100644 --- a/chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc +++ b/chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc @@ -8,9 +8,9 @@ #include "base/lazy_instance.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/tab_contents/render_view_context_menu_gtk.h" #include "chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.h" #include "chrome/browser/ui/gtk/constrained_window_gtk.h" +#include "chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.h" #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_gtk.cc b/chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.cc index 0c3699c..2c43f2b 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_gtk.cc +++ b/chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.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_gtk.h" +#include "chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.h" #include <gtk/gtk.h> diff --git a/chrome/browser/tab_contents/render_view_context_menu_gtk.h b/chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.h index ec62d56..ac485f3 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_gtk.h +++ b/chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.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_GTK_H_ -#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_GTK_H_ +#ifndef CHROME_BROWSER_UI_GTK_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_GTK_H_ +#define CHROME_BROWSER_UI_GTK_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_GTK_H_ #pragma once #include "base/compiler_specific.h" @@ -52,4 +52,4 @@ class RenderViewContextMenuGtk : public RenderViewContextMenu, uint32_t triggering_event_time_; }; -#endif // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_GTK_H_ +#endif // CHROME_BROWSER_UI_GTK_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_GTK_H_ diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc index 4dc6ef5..9d8509d 100644 --- a/chrome/browser/ui/views/external_tab_container_win.cc +++ b/chrome/browser/ui/views/external_tab_container_win.cc @@ -26,7 +26,6 @@ #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/repost_form_warning_controller.h" -#include "chrome/browser/tab_contents/render_view_context_menu_win.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h" #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" @@ -35,6 +34,7 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/views/infobars/infobar_container_view.h" +#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_win.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_win.cc index bff9a82..1a9b2f4 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_win.cc +++ b/chrome/browser/ui/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/ui/views/tab_contents/render_view_context_menu_win.h" #include "base/win/metro.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_win.h b/chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h index d6309b9..c428d7e 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_win.h +++ b/chrome/browser/ui/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_UI_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_ +#define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_ #pragma once #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" @@ -32,4 +32,4 @@ class RenderViewContextMenuWin : public RenderViewContextMenuViews { DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuWin); }; -#endif // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_ +#endif // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_ diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 0a7cbf90a..d37f4f4 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2256,12 +2256,6 @@ 'browser/tab_contents/simple_alert_infobar_delegate.h', 'browser/tab_contents/render_view_context_menu.cc', 'browser/tab_contents/render_view_context_menu.h', - 'browser/tab_contents/render_view_context_menu_gtk.cc', - 'browser/tab_contents/render_view_context_menu_gtk.h', - 'browser/tab_contents/render_view_context_menu_mac.h', - 'browser/tab_contents/render_view_context_menu_mac.mm', - '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_observer.cc', 'browser/tab_contents/render_view_context_menu_observer.h', 'browser/tab_contents/retargeting_details.h', @@ -2767,6 +2761,8 @@ 'browser/ui/cocoa/styled_text_field_cell.mm', 'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h', 'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm', + 'browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h', + 'browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm', 'browser/ui/cocoa/tab_contents/favicon_util.h', 'browser/ui/cocoa/tab_contents/favicon_util.mm', 'browser/ui/cocoa/tab_contents/previewable_contents_controller.h', @@ -3106,6 +3102,8 @@ 'browser/ui/gtk/status_icons/status_tray_gtk.h', 'browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc', 'browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.h', + 'browser/ui/gtk/tab_contents/render_view_context_menu_gtk.cc', + 'browser/ui/gtk/tab_contents/render_view_context_menu_gtk.h', 'browser/ui/gtk/tab_contents_container_gtk.cc', 'browser/ui/gtk/tab_contents_container_gtk.h', 'browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc', @@ -3691,6 +3689,8 @@ 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h', 'browser/ui/views/tab_contents/render_view_context_menu_views.cc', 'browser/ui/views/tab_contents/render_view_context_menu_views.h', + 'browser/ui/views/tab_contents/render_view_context_menu_win.cc', + 'browser/ui/views/tab_contents/render_view_context_menu_win.h', 'browser/ui/views/tab_icon_view.cc', 'browser/ui/views/tab_icon_view.h', 'browser/ui/views/tab_modal_confirm_dialog_views.cc', |