From 2544cbb6491bd95c76e477b8777496c966c7db9d Mon Sep 17 00:00:00 2001 From: "acolwell@chromium.org" Date: Mon, 4 Jun 2012 23:48:09 +0000 Subject: Revert 140426 - Ensure that the new window context menu option does not show up in windows 8 metro mode. Reverted because it breaks ChromeOS builds. When the new window option is executed from the incognito window, we find an existing normal browser window and open the url in a new tab. BUG=124404 R=sky Review URL: https://chromiumcodereview.appspot.com/10442119 TBR=ananta@chromium.org Review URL: https://chromiumcodereview.appspot.com/10529003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140432 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/external_tab/external_tab_container_win.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'chrome/browser/external_tab') diff --git a/chrome/browser/external_tab/external_tab_container_win.cc b/chrome/browser/external_tab/external_tab_container_win.cc index 227c656..9c06ad8 100644 --- a/chrome/browser/external_tab/external_tab_container_win.cc +++ b/chrome/browser/external_tab/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_wrapper.h" #include "chrome/browser/ui/views/infobars/infobar_container_view.h" +#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" @@ -625,10 +625,9 @@ bool ExternalTabContainer::HandleContextMenu( NOTREACHED(); return false; } - external_context_menu_.reset(RenderViewContextMenuViews::Create( - web_contents(), params)); - static_cast( - external_context_menu_.get())->SetExternal(); + external_context_menu_.reset( + new RenderViewContextMenuViews(web_contents(), params)); + external_context_menu_->SetExternal(); external_context_menu_->Init(); external_context_menu_->UpdateMenuItemStates(); -- cgit v1.1