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

Side by Side Diff: chrome/browser/chromeos/mobile/mobile_activator.h

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_MOBILE_MOBILE_ACTIVATOR_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_
6 #define CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_ 6 #define CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 private: 157 private:
158 friend struct DefaultSingletonTraits<MobileActivator>; 158 friend struct DefaultSingletonTraits<MobileActivator>;
159 friend class TestMobileActivator; 159 friend class TestMobileActivator;
160 friend class MobileActivatorTest; 160 friend class MobileActivatorTest;
161 161
162 MobileActivator(); 162 MobileActivator();
163 virtual ~MobileActivator(); 163 virtual ~MobileActivator();
164 164
165 // NetworkStateHandlerObserver overrides. 165 // NetworkStateHandlerObserver overrides.
166 virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE; 166 virtual void DefaultNetworkChanged(const NetworkState* network) override;
167 virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE; 167 virtual void NetworkPropertiesUpdated(const NetworkState* network) override;
168 168
169 // Continue activation after inital setup (config load). Makes an 169 // Continue activation after inital setup (config load). Makes an
170 // asynchronous call to NetworkConfigurationHandler::GetProperties. 170 // asynchronous call to NetworkConfigurationHandler::GetProperties.
171 void ContinueActivation(); 171 void ContinueActivation();
172 void GetPropertiesAndContinueActivation( 172 void GetPropertiesAndContinueActivation(
173 const std::string& service_path, 173 const std::string& service_path,
174 const base::DictionaryValue& properties); 174 const base::DictionaryValue& properties);
175 void GetPropertiesFailure(const std::string& error_name, 175 void GetPropertiesFailure(const std::string& error_name,
176 scoped_ptr<base::DictionaryValue> error_data); 176 scoped_ptr<base::DictionaryValue> error_data);
177 // Handles the signal that the payment portal has finished loading. 177 // Handles the signal that the payment portal has finished loading.
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 320
321 ObserverList<Observer> observers_; 321 ObserverList<Observer> observers_;
322 base::WeakPtrFactory<MobileActivator> weak_ptr_factory_; 322 base::WeakPtrFactory<MobileActivator> weak_ptr_factory_;
323 323
324 DISALLOW_COPY_AND_ASSIGN(MobileActivator); 324 DISALLOW_COPY_AND_ASSIGN(MobileActivator);
325 }; 325 };
326 326
327 } // namespace chromeos 327 } // namespace chromeos
328 328
329 #endif // CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_ 329 #endif // CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/memory/oom_priority_manager.cc ('k') | chrome/browser/chromeos/mobile_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698