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

Side by Side Diff: chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_LOCAL_DISCOVERY_WIFI_WIFI_MANAGER_NONCHROMEOS_H_ 5 #ifndef CHROME_BROWSER_LOCAL_DISCOVERY_WIFI_WIFI_MANAGER_NONCHROMEOS_H_
6 #define CHROME_BROWSER_LOCAL_DISCOVERY_WIFI_WIFI_MANAGER_NONCHROMEOS_H_ 6 #define CHROME_BROWSER_LOCAL_DISCOVERY_WIFI_WIFI_MANAGER_NONCHROMEOS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "chrome/browser/local_discovery/wifi/wifi_manager.h" 15 #include "chrome/browser/local_discovery/wifi/wifi_manager.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 17
18 namespace local_discovery { 18 namespace local_discovery {
19 19
20 namespace wifi { 20 namespace wifi {
21 21
22 class WifiManagerNonChromeos : public WifiManager { 22 class WifiManagerNonChromeos : public WifiManager {
23 public: 23 public:
24 WifiManagerNonChromeos(); 24 WifiManagerNonChromeos();
25 virtual ~WifiManagerNonChromeos(); 25 virtual ~WifiManagerNonChromeos();
26 26
27 // WifiManager implementation. 27 // WifiManager implementation.
28 virtual void Start() OVERRIDE; 28 virtual void Start() override;
29 virtual void GetSSIDList(const SSIDListCallback& callback) OVERRIDE; 29 virtual void GetSSIDList(const SSIDListCallback& callback) override;
30 virtual void RequestScan() OVERRIDE; 30 virtual void RequestScan() override;
31 virtual void ConfigureAndConnectNetwork( 31 virtual void ConfigureAndConnectNetwork(
32 const std::string& ssid, 32 const std::string& ssid,
33 const WifiCredentials& credentials, 33 const WifiCredentials& credentials,
34 const SuccessCallback& callback) OVERRIDE; 34 const SuccessCallback& callback) override;
35 virtual void ConnectToNetworkByID(const std::string& internal_id, 35 virtual void ConnectToNetworkByID(const std::string& internal_id,
36 const SuccessCallback& callback) OVERRIDE; 36 const SuccessCallback& callback) override;
37 virtual void RequestNetworkCredentials( 37 virtual void RequestNetworkCredentials(
38 const std::string& ssid, 38 const std::string& ssid,
39 const CredentialsCallback& callback) OVERRIDE; 39 const CredentialsCallback& callback) override;
40 virtual void AddNetworkListObserver(NetworkListObserver* observer) OVERRIDE; 40 virtual void AddNetworkListObserver(NetworkListObserver* observer) override;
41 virtual void RemoveNetworkListObserver( 41 virtual void RemoveNetworkListObserver(
42 NetworkListObserver* observer) OVERRIDE; 42 NetworkListObserver* observer) override;
43 43
44 private: 44 private:
45 class WifiServiceWrapper; 45 class WifiServiceWrapper;
46 46
47 // Called when the network list changes. Used by WifiServiceWrapper. 47 // Called when the network list changes. Used by WifiServiceWrapper.
48 void OnNetworkListChanged(scoped_ptr<NetworkPropertiesList> ssid_list); 48 void OnNetworkListChanged(scoped_ptr<NetworkPropertiesList> ssid_list);
49 49
50 // Used to post callbacks that take a const& network list without copying the 50 // Used to post callbacks that take a const& network list without copying the
51 // vector between threads. 51 // vector between threads.
52 void PostSSIDListCallback(const SSIDListCallback& callback, 52 void PostSSIDListCallback(const SSIDListCallback& callback,
(...skipping 11 matching lines...) Expand all
64 base::WeakPtrFactory<WifiManagerNonChromeos> weak_factory_; 64 base::WeakPtrFactory<WifiManagerNonChromeos> weak_factory_;
65 65
66 DISALLOW_COPY_AND_ASSIGN(WifiManagerNonChromeos); 66 DISALLOW_COPY_AND_ASSIGN(WifiManagerNonChromeos);
67 }; 67 };
68 68
69 } // namespace wifi 69 } // namespace wifi
70 70
71 } // namespace local_discovery 71 } // namespace local_discovery
72 72
73 #endif // CHROME_BROWSER_LOCAL_DISCOVERY_WIFI_WIFI_MANAGER_NONCHROMEOS_H_ 73 #endif // CHROME_BROWSER_LOCAL_DISCOVERY_WIFI_WIFI_MANAGER_NONCHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698