chrome/browser/extensions/extension_tabs_module.cc - Issue 7520023: Converted IncognitoForced boolean policy into IncognitoModeAvailability enum policy.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_tabs_module.cc

Issue 7520023: Converted IncognitoForced boolean policy into IncognitoModeAvailability enum policy. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Ignore incognito policies if values cannot be parsed. Address comments. 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

« no previous file with comments | « chrome/browser/extensions/extension_tabs_apitest.cc ('k') | chrome/browser/policy/config_dir_policy_provider_unittest.cc » ('j') | chrome/browser/policy/configuration_policy_pref_store.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_tabs_module.cc

diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc

index b0472e10bf8ad45d1bdfefb9a4572d0adde83756..a949b4df1de9d75d041314d9248999ed25cfe9b4 100644

--- a/chrome/browser/extensions/extension_tabs_module.cc

+++ b/chrome/browser/extensions/extension_tabs_module.cc

@@ -19,6 +19,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_tabs_module_constants.h"

#include "chrome/browser/net/url_fixer_upper.h"

+#include "chrome/browser/prefs/incognito_mode_prefs.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sessions/restore_tab_helper.h"

#include "chrome/browser/tabs/tab_strip_model.h"

@@ -527,7 +528,8 @@ bool CreateWindowFunction::RunImpl() {

if (args->HasKey(keys::kIncognitoKey)) {

EXTENSION_FUNCTION_VALIDATE(args->GetBoolean(keys::kIncognitoKey,

&incognito));

- if (!profile_->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled)) {

+ if (IncognitoModePrefs::GetAvailability(profile_->GetPrefs()) ==

+ IncognitoModePrefs::DISABLED) {

error_ = keys::kIncognitoModeIsDisabled;

return false;

}