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

Side by Side Diff: chromeos/network/network_cert_migrator.h

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 CHROMEOS_NETWORK_NETWORK_CERT_MIGRATOR_H_ 5 #ifndef CHROMEOS_NETWORK_NETWORK_CERT_MIGRATOR_H_
6 #define CHROMEOS_NETWORK_NETWORK_CERT_MIGRATOR_H_ 6 #define CHROMEOS_NETWORK_NETWORK_CERT_MIGRATOR_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chromeos/cert_loader.h" 10 #include "chromeos/cert_loader.h"
(...skipping 13 matching lines...) Expand all
24 24
25 private: 25 private:
26 friend class NetworkHandler; 26 friend class NetworkHandler;
27 friend class NetworkCertMigratorTest; 27 friend class NetworkCertMigratorTest;
28 class MigrationTask; 28 class MigrationTask;
29 29
30 NetworkCertMigrator(); 30 NetworkCertMigrator();
31 void Init(NetworkStateHandler* network_state_handler); 31 void Init(NetworkStateHandler* network_state_handler);
32 32
33 // NetworkStateHandlerObserver overrides 33 // NetworkStateHandlerObserver overrides
34 virtual void NetworkListChanged() OVERRIDE; 34 virtual void NetworkListChanged() override;
35 35
36 // CertLoader::Observer overrides 36 // CertLoader::Observer overrides
37 virtual void OnCertificatesLoaded(const net::CertificateList& cert_list, 37 virtual void OnCertificatesLoaded(const net::CertificateList& cert_list,
38 bool initial_load) OVERRIDE; 38 bool initial_load) override;
39 39
40 // Unowned associated NetworkStateHandler* (global or test instance). 40 // Unowned associated NetworkStateHandler* (global or test instance).
41 NetworkStateHandler* network_state_handler_; 41 NetworkStateHandler* network_state_handler_;
42 42
43 base::WeakPtrFactory<NetworkCertMigrator> weak_ptr_factory_; 43 base::WeakPtrFactory<NetworkCertMigrator> weak_ptr_factory_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(NetworkCertMigrator); 45 DISALLOW_COPY_AND_ASSIGN(NetworkCertMigrator);
46 }; 46 };
47 47
48 } // namespace chromeos 48 } // namespace chromeos
49 49
50 #endif // CHROMEOS_NETWORK_NETWORK_CERT_MIGRATOR_H_ 50 #endif // CHROMEOS_NETWORK_NETWORK_CERT_MIGRATOR_H_
OLDNEW
« no previous file with comments | « chromeos/network/managed_network_configuration_handler_unittest.cc ('k') | chromeos/network/network_cert_migrator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698