| Index: chrome/browser/tab_contents/render_view_context_menu.cc
|
| diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
|
| index 11a5887fdff91b603c15fdfcdaeeaa369770eadc..7fa1eadbcd63316e45c2798170b0fd3f6ea2b16a 100644
|
| --- a/chrome/browser/tab_contents/render_view_context_menu.cc
|
| +++ b/chrome/browser/tab_contents/render_view_context_menu.cc
|
| @@ -28,6 +28,7 @@
|
| #include "chrome/browser/net/browser_url_util.h"
|
| #include "chrome/browser/page_info_window.h"
|
| #include "chrome/browser/platform_util.h"
|
| +#include "chrome/browser/prefs/incognito_mode_prefs.h"
|
| #include "chrome/browser/prefs/pref_member.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -962,6 +963,8 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
|
| return true;
|
| }
|
|
|
| + IncognitoModePrefs::Availability incognito_avail =
|
| + IncognitoModePrefs::GetAvailability(profile_->GetPrefs());
|
| switch (id) {
|
| case IDC_BACK:
|
| return source_tab_contents_->controller().CanGoBack();
|
| @@ -1013,8 +1016,10 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
|
| }
|
|
|
| case IDC_CONTENT_CONTEXT_OPENLINKNEWTAB:
|
| - case IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW:
|
| return params_.link_url.is_valid();
|
| + case IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW:
|
| + return params_.link_url.is_valid() &&
|
| + incognito_avail != IncognitoModePrefs::FORCED;
|
|
|
| case IDC_CONTENT_CONTEXT_COPYLINKLOCATION:
|
| return params_.unfiltered_link_url.is_valid();
|
| @@ -1138,7 +1143,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
|
|
|
| case IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD:
|
| return !profile_->IsOffTheRecord() && params_.link_url.is_valid() &&
|
| - profile_->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled);
|
| + incognito_avail != IncognitoModePrefs::DISABLED;
|
|
|
| case IDC_SPELLCHECK_ADD_TO_DICTIONARY:
|
| return !params_.misspelled_word.empty();
|
|
|