Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

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

Issue 2829163004: Remove uses of base::hash_map from //chrome (Closed)
Patch Set: Downloads back Created 3 years, 5 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
OLDNEW
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 <map>
8 #include <memory> 9 #include <memory>
9 #include <string> 10 #include <string>
10 11
11 #include "base/cancelable_callback.h" 12 #include "base/cancelable_callback.h"
12 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
13 #include "base/containers/hash_tables.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/observer_list.h" 17 #include "base/observer_list.h"
18 #include "base/sequence_checker.h" 18 #include "base/sequence_checker.h"
19 #include "base/time/time.h" 19 #include "base/time/time.h"
20 #include "chromeos/network/network_state_handler_observer.h" 20 #include "chromeos/network/network_state_handler_observer.h"
21 #include "chromeos/network/portal_detector/network_portal_detector.h" 21 #include "chromeos/network/portal_detector/network_portal_detector.h"
22 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" 22 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"
23 #include "components/captive_portal/captive_portal_detector.h" 23 #include "components/captive_portal/captive_portal_detector.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // Set the URL to be tested for portal state. 68 // Set the URL to be tested for portal state.
69 void set_portal_test_url(const GURL& portal_test_url) { 69 void set_portal_test_url(const GURL& portal_test_url) {
70 portal_test_url_ = portal_test_url; 70 portal_test_url_ = portal_test_url;
71 } 71 }
72 72
73 private: 73 private:
74 friend class ::NetworkingConfigTest; 74 friend class ::NetworkingConfigTest;
75 friend class NetworkPortalDetectorImplTest; 75 friend class NetworkPortalDetectorImplTest;
76 friend class NetworkPortalDetectorImplBrowserTest; 76 friend class NetworkPortalDetectorImplBrowserTest;
77 77
78 using CaptivePortalStateMap = base::hash_map<std::string, CaptivePortalState>; 78 using CaptivePortalStateMap = std::map<std::string, CaptivePortalState>;
79 79
80 enum State { 80 enum State {
81 // No portal check is running. 81 // No portal check is running.
82 STATE_IDLE = 0, 82 STATE_IDLE = 0,
83 // Waiting for portal check. 83 // Waiting for portal check.
84 STATE_PORTAL_CHECK_PENDING, 84 STATE_PORTAL_CHECK_PENDING,
85 // Portal check is in progress. 85 // Portal check is in progress.
86 STATE_CHECKING_FOR_PORTAL, 86 STATE_CHECKING_FOR_PORTAL,
87 // No portal check when successfully behind portal. 87 // No portal check when successfully behind portal.
88 STATE_BEHIND_PORTAL_IDLE, 88 STATE_BEHIND_PORTAL_IDLE,
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 DetectionAttemptCompletedReport attempt_completed_report_; 280 DetectionAttemptCompletedReport attempt_completed_report_;
281 281
282 base::WeakPtrFactory<NetworkPortalDetectorImpl> weak_factory_; 282 base::WeakPtrFactory<NetworkPortalDetectorImpl> weak_factory_;
283 283
284 DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl); 284 DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl);
285 }; 285 };
286 286
287 } // namespace chromeos 287 } // namespace chromeos
288 288
289 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_ 289 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/chromeos/net/network_portal_detector_test_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698