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

Side by Side Diff: content/browser/geolocation/wifi_data_provider_corewlan_mac.mm

Issue 631053003: Replacing the OVERRIDE with override and FINAL with final in content/browser/geolocation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved mac issue 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // Implements a WLAN API binding for CoreWLAN, as available on OSX 10.6 5 // Implements a WLAN API binding for CoreWLAN, as available on OSX 10.6
6 6
7 #include "content/browser/geolocation/wifi_data_provider_mac.h" 7 #include "content/browser/geolocation/wifi_data_provider_mac.h"
8 8
9 #include <dlfcn.h> 9 #include <dlfcn.h>
10 #import <Foundation/Foundation.h> 10 #import <Foundation/Foundation.h>
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface { 48 class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface {
49 public: 49 public:
50 CoreWlanApi() {} 50 CoreWlanApi() {}
51 51
52 // Must be called before any other interface method. Will return false if the 52 // Must be called before any other interface method. Will return false if the
53 // CoreWLAN framework cannot be initialized (e.g. running on pre-10.6 OSX), 53 // CoreWLAN framework cannot be initialized (e.g. running on pre-10.6 OSX),
54 // in which case no other method may be called. 54 // in which case no other method may be called.
55 bool Init(); 55 bool Init();
56 56
57 // WlanApiInterface 57 // WlanApiInterface
58 virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) OVERRIDE; 58 virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) override;
59 59
60 private: 60 private:
61 base::scoped_nsobject<NSBundle> bundle_; 61 base::scoped_nsobject<NSBundle> bundle_;
62 base::scoped_nsobject<NSString> merge_key_; 62 base::scoped_nsobject<NSString> merge_key_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(CoreWlanApi); 64 DISALLOW_COPY_AND_ASSIGN(CoreWlanApi);
65 }; 65 };
66 66
67 bool CoreWlanApi::Init() { 67 bool CoreWlanApi::Init() {
68 // As the WLAN api binding runs on its own thread, we need to provide our own 68 // As the WLAN api binding runs on its own thread, we need to provide our own
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 WifiDataProviderCommon::WlanApiInterface* NewCoreWlanApi() { 179 WifiDataProviderCommon::WlanApiInterface* NewCoreWlanApi() {
180 scoped_ptr<CoreWlanApi> self(new CoreWlanApi); 180 scoped_ptr<CoreWlanApi> self(new CoreWlanApi);
181 if (self->Init()) 181 if (self->Init())
182 return self.release(); 182 return self.release();
183 183
184 return NULL; 184 return NULL;
185 } 185 }
186 186
187 } // namespace content 187 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698