chrome/browser/profiles/profile.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/profiles/profile.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, 4 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

« chrome/browser/policy/configuration_policy_pref_store.cc ('K') | « chrome/browser/prefs/pref_value_map_unittest.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile.cc

diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc

index 2867fcfa2bfd5a7d724c2ea0080cd987a98e6eee..5305eb7ee0326b5c82bca58c9d4db1ffb345e843 100644

--- a/chrome/browser/profiles/profile.cc

+++ b/chrome/browser/profiles/profile.cc

@@ -27,6 +27,7 @@

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

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

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

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

#include "chrome/browser/prefs/pref_service.h"

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

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

@@ -238,7 +239,8 @@ class OffTheRecordProfileImpl : public Profile,

ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);

- DCHECK(real_profile->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled));

+ DCHECK_NE(IncognitoModePrefs::DISABLED,

+ IncognitoModePrefs::GetAvailability(real_profile->GetPrefs()));

// TODO(oshima): Remove the need to eagerly initialize the request context

// getter. chromeos::OnlineAttempt is illegally trying to access this