chrome/browser/chromeos/login/screens/update_screen.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/chromeos/login/screens/update_screen.h

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

Patch Set: rebase again Created 7 years, 7 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/login/managed/locally_managed_user_creation_screen.cc ('k') | chrome/browser/chromeos/login/screens/update_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/update_screen.h

diff --git a/chrome/browser/chromeos/login/screens/update_screen.h b/chrome/browser/chromeos/login/screens/update_screen.h

index a4ad065ef373a802614348e1c8bb1ddb0b3f1b2d..bdfd26b98202daaa31c730c05a7d14cd1222c708 100644

--- a/chrome/browser/chromeos/login/screens/update_screen.h

+++ b/chrome/browser/chromeos/login/screens/update_screen.h

@@ -21,6 +21,7 @@

namespace chromeos {

class ErrorScreen;

+class NetworkState;

class ScreenObserver;

// Controller for the update screen. It does not depend on the specific

@@ -71,7 +72,7 @@ class UpdateScreen: public UpdateEngineClient::Observer,

// NetworkPortalDetector::Observer implementation:

virtual void OnPortalDetectionCompleted(

- const Network* network,

+ const NetworkState* network,

const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE;

private:

@@ -106,7 +107,7 @@ class UpdateScreen: public UpdateEngineClient::Observer,

void ShowErrorMessage();

void HideErrorMessage();

void UpdateErrorMessage(

- const Network* network,

+ const NetworkState* network,

const NetworkPortalDetector::CaptivePortalStatus status);

// Timer for the interval to wait for the reboot.

// If reboot didn't happen - ask user to reboot manually.