chrome/browser/chromeos/net/network_portal_detector_impl.h - Issue 23684042: Eliminate NetworkManagerChanged

Side by Side Diff: chrome/browser/chromeos/net/network_portal_detector_impl.h

Issue 23684042: Eliminate NetworkManagerChanged (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller_browsertest.cc ('k') | chrome/browser/chromeos/net/network_portal_detector_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_

6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_	6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 virtual void RemoveObserver(Observer* observer) OVERRIDE;	54 virtual void RemoveObserver(Observer* observer) OVERRIDE;

55 virtual CaptivePortalState GetCaptivePortalState(	55 virtual CaptivePortalState GetCaptivePortalState(

56 const chromeos::NetworkState* network) OVERRIDE;	56 const chromeos::NetworkState* network) OVERRIDE;

57 virtual bool IsEnabled() OVERRIDE;	57 virtual bool IsEnabled() OVERRIDE;

58 virtual void Enable(bool start_detection) OVERRIDE;	58 virtual void Enable(bool start_detection) OVERRIDE;

59 virtual bool StartDetectionIfIdle() OVERRIDE;	59 virtual bool StartDetectionIfIdle() OVERRIDE;

60 virtual void EnableLazyDetection() OVERRIDE;	60 virtual void EnableLazyDetection() OVERRIDE;

61 virtual void DisableLazyDetection() OVERRIDE;	61 virtual void DisableLazyDetection() OVERRIDE;

62	62

63 // NetworkStateHandlerObserver implementation:	63 // NetworkStateHandlerObserver implementation:

64 virtual void NetworkManagerChanged() OVERRIDE;

65 virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE;	64 virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE;

66	65

67 private:	66 private:

68 friend class NetworkPortalDetectorImplTest;	67 friend class NetworkPortalDetectorImplTest;

69	68

70 typedef std::string NetworkId;	69 typedef std::string NetworkId;

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

72	71

73 enum State {	72 enum State {

74 // No portal check is running.	73 // No portal check is running.

(...skipping 174 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
249 bool request_timeout_for_testing_initialized_;	248 bool request_timeout_for_testing_initialized_;

250	249

251 content::NotificationRegistrar registrar_;	250 content::NotificationRegistrar registrar_;

252	251

253 DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl);	252 DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl);

254 };	253 };

255	254

256 } // namespace chromeos	255 } // namespace chromeos

257	256

258 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_	257 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_

OLD	NEW