chrome/browser/net/proxy_service_factory.cc - Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only

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/net/proxy_service_factory.cc

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Upload after merge Created 8 years, 3 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/chromeos/proxy_config_service_impl.cc ('k') | chrome/browser/resources/chromeos/login/screen_error_message.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/proxy_service_factory.cc

diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc

index 6a60a2f1093a7f93d2d92961a61b55d974f78e62..2cdd496bbf8a63df70e42e7bc103b1c5b9c3277d 100644

--- a/chrome/browser/net/proxy_service_factory.cc

+++ b/chrome/browser/net/proxy_service_factory.cc

@@ -38,7 +38,7 @@ ChromeProxyConfigService* ProxyServiceFactory::CreateProxyConfigService(

#if !defined(OS_CHROMEOS)

// On ChromeOS, base service is NULL; chromeos::ProxyConfigServiceImpl

// determines the effective proxy config to take effect in the network layer,

- // be it from prefs or system (which is network flimflam on chromeos).

+ // be it from prefs or system (which is network shill on chromeos).

// For other platforms, create a baseline service that provides proxy

// configuration in case nothing is configured through prefs (Note: prefs