diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 23:48:09 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 23:48:09 +0000 |
| commit | 2544cbb6491bd95c76e477b8777496c966c7db9d (patch) | |
| tree | 106b3acfb21444f6236f618b29d83050978bb96c /chrome/browser/external_tab | |
| parent | c564ba125806be99271dbd6ce3a6f70f6170c6c1 (diff) | |
| download | chromium_src-2544cbb6491bd95c76e477b8777496c966c7db9d.zip chromium_src-2544cbb6491bd95c76e477b8777496c966c7db9d.tar.gz chromium_src-2544cbb6491bd95c76e477b8777496c966c7db9d.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/external_tab')
| -rw-r--r-- | chrome/browser/external_tab/external_tab_container_win.cc | 9 |
1 files changed, 4 insertions, 5 deletions
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<RenderViewContextMenuWin*>( - 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(); |