diff options
author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 22:30:46 +0000 |
---|---|---|
committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 22:30:46 +0000 |
commit | f8aee038b3d67b087fe773a56ad9721a3a36f6d5 (patch) | |
tree | 650dc2404d4aab125b80130baba3c994f2d216ae | |
parent | 4643695e5a2e094cee61a107dc9024a02d7824e5 (diff) | |
download | chromium_src-f8aee038b3d67b087fe773a56ad9721a3a36f6d5.zip chromium_src-f8aee038b3d67b087fe773a56ad9721a3a36f6d5.tar.gz chromium_src-f8aee038b3d67b087fe773a56ad9721a3a36f6d5.tar.bz2 |
Disable navigation contextual menus for Sync dialog UI.
BUG=30710,30706
TEST=Invoke a contextual menu in the Sync sign-in dialog, navigation items
should not appear.
Review URL: http://codereview.chromium.org/2487002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48781 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.cc | 10 | ||||
-rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.h | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 20d22e3..cc54c27 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -55,6 +55,12 @@ bool RenderViewContextMenu::IsDevToolsURL(const GURL& url) { url.host() == chrome::kChromeUIDevToolsHost; } +// static +bool RenderViewContextMenu::IsSyncResourcesURL(const GURL& url) { + return url.SchemeIs(chrome::kChromeUIScheme) && + url.host() == chrome::kSyncResourcesHost; +} + static const int kSpellcheckRadioGroup = 1; static const int kExtensionsRadioGroup = 2; @@ -290,11 +296,11 @@ void RenderViewContextMenu::InitMenu() { // If context is in subframe, show subframe options instead. if (!params_.frame_url.is_empty()) { is_devtools = IsDevToolsURL(params_.frame_url); - if (!is_devtools) + if (!is_devtools && !IsSyncResourcesURL(params_.frame_url)) AppendFrameItems(); } else if (!params_.page_url.is_empty()) { is_devtools = IsDevToolsURL(params_.page_url); - if (!is_devtools) + if (!is_devtools && !IsSyncResourcesURL(params_.page_url)) AppendPageItems(); } } diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h index f6aafea..fd264ff 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.h +++ b/chrome/browser/tab_contents/render_view_context_menu.h @@ -63,6 +63,7 @@ class RenderViewContextMenu : public menus::SimpleMenuModel::Delegate { private: static bool IsDevToolsURL(const GURL& url); + static bool IsSyncResourcesURL(const GURL& url); bool AppendCustomItems(); void AppendDeveloperItems(); void AppendLinkItems(); |