chrome/browser/extensions/extension_tabs_apitest.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_apitest.cc

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

Patch Set: Fix enum entry names & wrong include path. 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/bookmarks/bookmark_context_menu_controller.cc ('k') | chrome/browser/extensions/extension_tabs_module.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_apitest.cc

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

index 5e420af7be7033f3f0e9b1787692476ec2d140b0..fa6b2419407cb7cbfa6e83c4e32fad097928f729 100644

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

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

@@ -4,6 +4,7 @@

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

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

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

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

#include "chrome/browser/ui/browser.h"

@@ -200,7 +201,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FocusWindowDoesNotUnmaximize) {

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledByPref) {

ASSERT_TRUE(StartTestServer());

- browser()->profile()->GetPrefs()->SetBoolean(prefs::kIncognitoEnabled, false);

+ IncognitoModePrefs::SetAvailability(IncognitoModePrefs::DISABLED,

+ browser()->profile()->GetPrefs());

// This makes sure that creating an incognito window fails due to pref

// (policy) being set.