chrome/browser/chromeos/net/network_portal_detector_stub.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/net/network_portal_detector_stub.h

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

Patch Set: remove last reference to lastNetworkType 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/net/network_portal_detector_impl_unittest.cc ('k') | chrome/browser/chromeos/net/network_portal_detector_stub.cc » ('j') | chromeos/network/network_state_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/network_portal_detector_stub.h

diff --git a/chrome/browser/chromeos/net/network_portal_detector_stub.h b/chrome/browser/chromeos/net/network_portal_detector_stub.h

index dae577662685944d4388fd763fbb87fc4e5b5a64..3ff7d577979b6c6b0b3d83982f8c9059cecbfbd4 100644

--- a/chrome/browser/chromeos/net/network_portal_detector_stub.h

+++ b/chrome/browser/chromeos/net/network_portal_detector_stub.h

@@ -27,7 +27,7 @@ class NetworkPortalDetectorStub : public NetworkPortalDetector {

virtual void AddAndFireObserver(Observer* observer) OVERRIDE;

virtual void RemoveObserver(Observer* observer) OVERRIDE;

virtual CaptivePortalState GetCaptivePortalState(

- const chromeos::Network* network) OVERRIDE;

+ const chromeos::NetworkState* network) OVERRIDE;

virtual bool IsEnabled() OVERRIDE;

virtual void Enable(bool start_detection) OVERRIDE;

virtual void EnableLazyDetection() OVERRIDE;

@@ -39,13 +39,13 @@ class NetworkPortalDetectorStub : public NetworkPortalDetector {

typedef std::string NetworkId;

typedef base::hash_map<NetworkId, CaptivePortalState> CaptivePortalStateMap;

- void SetActiveNetworkForTesting(const Network* network);

- void SetDetectionResultsForTesting(const Network* network,

+ void SetDefaultNetworkForTesting(const NetworkState* network);

+ void SetDetectionResultsForTesting(const NetworkState* network,

const CaptivePortalState& state);

void NotifyObserversForTesting();

ObserverList<Observer> observers_;

- const Network* active_network_;

+ const NetworkState* default_network_;

CaptivePortalStateMap portal_state_map_;

DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorStub);