chrome/browser/extensions/extension_proxy_apitest.cc - Issue 5915004: Introduce incognito preference settings.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/extension_proxy_apitest.cc

Issue 5915004: Introduce incognito preference settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Continued work from last year Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/extensions/extension_proxy_api.cc ('K') | « chrome/browser/extensions/extension_proxy_api.cc ('k') | chrome/browser/extensions/extension_updater.cc » ('j') | chrome/browser/extensions/extension_updater.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
	Mattias Nissler (ping if slow) 2011/01/05 12:08:07 Don't update the header if you don't touch the fil Don't update the header if you don't touch the file. battre 2011/01/05 20:23:08 Done. Show quoted text On 2011/01/05 12:08:07, Mattias Nissler wrote: > Don't update the header if you don't touch the file. Done.
2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

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

7 #include "chrome/browser/prefs/proxy_prefs.h"	7 #include "chrome/browser/prefs/proxy_prefs.h"

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

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

10 #include "chrome/common/chrome_switches.h"	10 #include "chrome/common/chrome_switches.h"

11 #include "chrome/common/extensions/extension.h"	11 #include "chrome/common/extensions/extension.h"

(...skipping 186 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
198 ASSERT_TRUE(pref != NULL);	198 ASSERT_TRUE(pref != NULL);

199 EXPECT_TRUE(pref->IsExtensionControlled());	199 EXPECT_TRUE(pref->IsExtensionControlled());

200 EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS,	200 EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS,

201 pref_service->GetInteger(prefs::kProxyMode));	201 pref_service->GetInteger(prefs::kProxyMode));

202	202

203 pref = pref_service->FindPreference(prefs::kProxyPacUrl);	203 pref = pref_service->FindPreference(prefs::kProxyPacUrl);

204 ASSERT_TRUE(pref != NULL);	204 ASSERT_TRUE(pref != NULL);

205 EXPECT_TRUE(pref->IsExtensionControlled());	205 EXPECT_TRUE(pref->IsExtensionControlled());

206 EXPECT_EQ("", pref_service->GetString(prefs::kProxyPacUrl));	206 EXPECT_EQ("", pref_service->GetString(prefs::kProxyPacUrl));

207 }	207 }

OLD	NEW