Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2545)

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc

Issue 7520023: Converted IncognitoForced boolean policy into IncognitoModeAvailability enum policy. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
index fe6ff6b1bb8e607ed257a821104c926cccfc6720..ff9a7c90b13e4bb98be8e1ffaf33a37ef91f64c2 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
+#include "chrome/browser/prefs/incognito_mode_availability_prefs.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -237,15 +238,23 @@ bool BookmarkContextMenuControllerViews::IsCommandEnabled(int id) const {
switch (id) {
case IDC_BOOKMARK_BAR_OPEN_INCOGNITO:
return !profile_->IsOffTheRecord() &&
- profile_->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled);
+ profile_->GetPrefs()->GetInteger(
+ prefs::kIncognitoModeAvailability) !=
+ IncognitoModeAvailabilityPrefs::DISABLED;
case IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO:
return HasURLs() && !profile_->IsOffTheRecord() &&
- profile_->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled);
+ profile_->GetPrefs()->GetInteger(
+ prefs::kIncognitoModeAvailability) !=
+ IncognitoModeAvailabilityPrefs::DISABLED;
case IDC_BOOKMARK_BAR_OPEN_ALL:
- case IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW:
return HasURLs();
+ case IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW:
+ return HasURLs() &&
+ profile_->GetPrefs()->GetInteger(
+ prefs::kIncognitoModeAvailability) !=
+ IncognitoModeAvailabilityPrefs::FORCED;
case IDC_BOOKMARK_BAR_RENAME_FOLDER:
case IDC_BOOKMARK_BAR_EDIT:

Powered by Google App Engine
This is Rietveld 408576698