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

Side by Side Diff: net/android/network_change_notifier_android.h

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment 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
« no previous file with comments | « no previous file | net/android/network_change_notifier_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 NET_ANDROID_NETWORK_CHANGE_NOTIFIER_ANDROID_H_ 5 #ifndef NET_ANDROID_NETWORK_CHANGE_NOTIFIER_ANDROID_H_
6 #define NET_ANDROID_NETWORK_CHANGE_NOTIFIER_ANDROID_H_ 6 #define NET_ANDROID_NETWORK_CHANGE_NOTIFIER_ANDROID_H_
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 27 matching lines...) Expand all
38 // and be called by any thread. 38 // and be called by any thread.
39 // 39 //
40 // For more details, see the implementation file. 40 // For more details, see the implementation file.
41 class NET_EXPORT_PRIVATE NetworkChangeNotifierAndroid 41 class NET_EXPORT_PRIVATE NetworkChangeNotifierAndroid
42 : public NetworkChangeNotifier, 42 : public NetworkChangeNotifier,
43 public NetworkChangeNotifierDelegateAndroid::Observer { 43 public NetworkChangeNotifierDelegateAndroid::Observer {
44 public: 44 public:
45 virtual ~NetworkChangeNotifierAndroid(); 45 virtual ~NetworkChangeNotifierAndroid();
46 46
47 // NetworkChangeNotifier: 47 // NetworkChangeNotifier:
48 virtual ConnectionType GetCurrentConnectionType() const OVERRIDE; 48 virtual ConnectionType GetCurrentConnectionType() const override;
49 49
50 // NetworkChangeNotifierDelegateAndroid::Observer: 50 // NetworkChangeNotifierDelegateAndroid::Observer:
51 virtual void OnConnectionTypeChanged() OVERRIDE; 51 virtual void OnConnectionTypeChanged() override;
52 52
53 static bool Register(JNIEnv* env); 53 static bool Register(JNIEnv* env);
54 54
55 private: 55 private:
56 friend class NetworkChangeNotifierAndroidTest; 56 friend class NetworkChangeNotifierAndroidTest;
57 friend class NetworkChangeNotifierFactoryAndroid; 57 friend class NetworkChangeNotifierFactoryAndroid;
58 58
59 class DnsConfigServiceThread; 59 class DnsConfigServiceThread;
60 60
61 explicit NetworkChangeNotifierAndroid( 61 explicit NetworkChangeNotifierAndroid(
62 NetworkChangeNotifierDelegateAndroid* delegate); 62 NetworkChangeNotifierDelegateAndroid* delegate);
63 63
64 static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsAndroid(); 64 static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsAndroid();
65 65
66 NetworkChangeNotifierDelegateAndroid* const delegate_; 66 NetworkChangeNotifierDelegateAndroid* const delegate_;
67 scoped_ptr<DnsConfigServiceThread> dns_config_service_thread_; 67 scoped_ptr<DnsConfigServiceThread> dns_config_service_thread_;
68 68
69 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierAndroid); 69 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierAndroid);
70 }; 70 };
71 71
72 } // namespace net 72 } // namespace net
73 73
74 #endif // NET_ANDROID_NETWORK_CHANGE_NOTIFIER_ANDROID_H_ 74 #endif // NET_ANDROID_NETWORK_CHANGE_NOTIFIER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | net/android/network_change_notifier_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698