diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 00:10:10 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 00:10:10 +0000 |
| commit | c088429f95d80542698e8d42ba6d2cce6c92d526 (patch) | |
| tree | 5ff0a721d5f7270417e7007b7bcc7380dc5e7913 /chrome/browser/chromeos/proxy_config_service_impl.h | |
| parent | 403e2bc9aaa547df934dc81aa90021424023277d (diff) | |
| download | chromium_src-c088429f95d80542698e8d42ba6d2cce6c92d526.zip chromium_src-c088429f95d80542698e8d42ba6d2cce6c92d526.tar.gz chromium_src-c088429f95d80542698e8d42ba6d2cce6c92d526.tar.bz2 | |
Revert 200968 "NetworkPortalDetector/NetworkStateInformer: Switc..."
Recurring interactive_ui_tests failure on debug CrOS bot:
ScreenLockerTest.TestBasic:
[19220:19220:0518/024626:1396652721:FATAL:webui_screen_locker.cc(208)] Check failed: false.
chromeos::WebUIScreenLocker::IsSigninInProgress()
chromeos::WebUILoginDisplay::IsSigninInProgress()
chromeos::SigninScreenHandler::UpdateStateInternal()
chromeos::SigninScreenHandler::UpdateState()
chromeos::NetworkStateInformer::SendStateToObservers()
chromeos::NetworkStateInformer::UpdateStateAndNotify()
> NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler
>
> This removes the direct network library dependency for NetworkPortalDetector,
> NetworkStateInformer, and SigninScreenHandler. UpdateScreen and
> LocallyManagedUserCreationHandler no longer depend on NetworkLibrary as well.
>
> Also change active -> default network in these to be consistent with
> terminology we use in NetworkStateHandler.
>
> BUG=189093,189009
>
> Review URL: https://chromiumcodereview.appspot.com/14134007
TBR=gauravsh@chromium.org
Review URL: https://codereview.chromium.org/15421003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/proxy_config_service_impl.h')
| -rw-r--r-- | chrome/browser/chromeos/proxy_config_service_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h index 12fac79..730e003 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.h +++ b/chrome/browser/chromeos/proxy_config_service_impl.h @@ -198,9 +198,9 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl, virtual void OnNetworkChanged(NetworkLibrary* cros, const Network* network) OVERRIDE; - // Parse |proxy_config_string| and store result in |proxy_config|. + // Parse |network| proxy config and store result in |proxy_config|. // Returns true if proxy config was successfully parsed. - static bool ParseProxyConfig(const std::string& proxy_config_string, + static bool ParseProxyConfig(const Network* network, net::ProxyConfig* proxy_config); // Register UseShardProxies preference. |