diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:38:38 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:38:38 +0000 |
| commit | ba6b5cfec256bf3e2050a128289c062effede0d2 (patch) | |
| tree | 274a882ae1ca7e4c1667813d76f3d9cc0158fc2f /chrome/browser/tab_contents | |
| parent | 894f4a077ae70c658a285377c0f957c0259817d3 (diff) | |
| download | chromium_src-ba6b5cfec256bf3e2050a128289c062effede0d2.zip chromium_src-ba6b5cfec256bf3e2050a128289c062effede0d2.tar.gz chromium_src-ba6b5cfec256bf3e2050a128289c062effede0d2.tar.bz2 | |
Allow quering Pepper plugin for selected text for the context menu. Also take out the ability to access the clipboard since it's not exposed to HTML for security reasons.
Review URL: http://codereview.chromium.org/2841028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 8fb7fa2..ffbf57c 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -738,7 +738,8 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const { source_tab_contents_->language_state().original_language(); std::string target_lang = g_browser_process->GetApplicationLocale(); target_lang = TranslateManager2::GetLanguageCode(target_lang); - return original_lang != target_lang && + return !!(params_.edit_flags & WebContextMenuData::CanTranslate) && + original_lang != target_lang && !source_tab_contents_->language_state().IsPageTranslated() && !source_tab_contents_->interstitial_page() && TranslateManager2::IsTranslatableURL(params_.page_url); |