chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h - Issue 14134007: NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

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/ui/webui/chromeos/login/signin_screen_handler.h

Issue 14134007: NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add proxy_config Created 7 years, 8 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/ui/webui/chromeos/login/network_state_informer.h ('K') | « chrome/browser/ui/webui/chromeos/login/network_state_informer.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

index 34a6c9f8a6f38cbe2741d1433c30bc9b5ec68938..3ae8c7db70c15a06fcfc9e7f9f605a824d558cc3 100644

--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

@@ -183,7 +183,7 @@ class SigninScreenHandler

// NetworkStateInformer::NetworkStateInformerObserver implementation:

virtual void UpdateState(NetworkStateInformer::State state,

const std::string& service_path,

- ConnectionType connection_type,

+ const std::string& connection_type,

const std::string& reason) OVERRIDE;

private:

@@ -205,13 +205,13 @@ class SigninScreenHandler

void UpdateUIState(UIState ui_state, DictionaryValue* params);

void UpdateStateInternal(NetworkStateInformer::State state,

- const std::string service_path,

- ConnectionType connection_type,

- std::string reason,

+ const std::string& service_path,

+ const std::string& connection_type,

+ const std::string& reason,

bool force_update);

void SetupAndShowOfflineMessage(NetworkStateInformer::State state,

const std::string& service_path,

- ConnectionType connection_type,

+ const std::string& connection_type,

const std::string& reason,

bool is_proxy_error,

bool is_under_captive_portal,