diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 23:33:30 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 23:33:30 +0000 |
| commit | 09b5135db1063c1ecef46e75b5f3773f7aeaff27 (patch) | |
| tree | 219f0a01817569753633a9457aeffbce213333bd /chrome/browser/external_tab | |
| parent | 7c44902b0b2f37e06cec5a6d38fe8cfb154dcde1 (diff) | |
| download | chromium_src-09b5135db1063c1ecef46e75b5f3773f7aeaff27.zip chromium_src-09b5135db1063c1ecef46e75b5f3773f7aeaff27.tar.gz chromium_src-09b5135db1063c1ecef46e75b5f3773f7aeaff27.tar.bz2 | |
Ensure that the new window context menu option does not show up in windows 8 metro mode.
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140426 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, 5 insertions, 4 deletions
diff --git a/chrome/browser/external_tab/external_tab_container_win.cc b/chrome/browser/external_tab/external_tab_container_win.cc index 9c06ad8..227c656 100644 --- a/chrome/browser/external_tab/external_tab_container_win.cc +++ b/chrome/browser/external_tab/external_tab_container_win.cc @@ -26,6 +26,7 @@ #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" @@ -34,7 +35,6 @@ #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,9 +625,10 @@ bool ExternalTabContainer::HandleContextMenu( NOTREACHED(); return false; } - external_context_menu_.reset( - new RenderViewContextMenuViews(web_contents(), params)); - external_context_menu_->SetExternal(); + external_context_menu_.reset(RenderViewContextMenuViews::Create( + web_contents(), params)); + static_cast<RenderViewContextMenuWin*>( + external_context_menu_.get())->SetExternal(); external_context_menu_->Init(); external_context_menu_->UpdateMenuItemStates(); |