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

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

Issue 1454313002: Adding platform support check for NetworkObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@home
Patch Set: Added forcing networkhandle support to NCNAndroid and NCNAndroidTest Created 5 years 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/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 public: 45 public:
46 ~NetworkChangeNotifierAndroid() override; 46 ~NetworkChangeNotifierAndroid() override;
47 47
48 // NetworkChangeNotifier: 48 // NetworkChangeNotifier:
49 ConnectionType GetCurrentConnectionType() const override; 49 ConnectionType GetCurrentConnectionType() const override;
50 // Requires ACCESS_WIFI_STATE permission in order to provide precise WiFi link 50 // Requires ACCESS_WIFI_STATE permission in order to provide precise WiFi link
51 // speed. 51 // speed.
52 void GetCurrentMaxBandwidthAndConnectionType( 52 void GetCurrentMaxBandwidthAndConnectionType(
53 double* max_bandwidth_mbps, 53 double* max_bandwidth_mbps,
54 ConnectionType* connection_type) const override; 54 ConnectionType* connection_type) const override;
55 bool AreNetworkHandlesCurrentlySupported() const override;
55 void GetCurrentConnectedNetworks(NetworkList* network_list) const override; 56 void GetCurrentConnectedNetworks(NetworkList* network_list) const override;
56 ConnectionType GetCurrentNetworkConnectionType( 57 ConnectionType GetCurrentNetworkConnectionType(
57 NetworkHandle network) const override; 58 NetworkHandle network) const override;
58 NetworkHandle GetCurrentDefaultNetwork() const override; 59 NetworkHandle GetCurrentDefaultNetwork() const override;
59 60
60 // NetworkChangeNotifierDelegateAndroid::Observer: 61 // NetworkChangeNotifierDelegateAndroid::Observer:
61 void OnConnectionTypeChanged() override; 62 void OnConnectionTypeChanged() override;
62 void OnMaxBandwidthChanged(double max_bandwidth_mbps, 63 void OnMaxBandwidthChanged(double max_bandwidth_mbps,
63 ConnectionType type) override; 64 ConnectionType type) override;
64 void OnNetworkConnected(NetworkHandle network) override; 65 void OnNetworkConnected(NetworkHandle network) override;
65 void OnNetworkSoonToDisconnect(NetworkHandle network) override; 66 void OnNetworkSoonToDisconnect(NetworkHandle network) override;
66 void OnNetworkDisconnected(NetworkHandle network) override; 67 void OnNetworkDisconnected(NetworkHandle network) override;
67 void OnNetworkMadeDefault(NetworkHandle network) override; 68 void OnNetworkMadeDefault(NetworkHandle network) override;
68 69
69 static bool Register(JNIEnv* env); 70 static bool Register(JNIEnv* env);
70 71
71 // Promote GetMaxBandwidthForConnectionSubtype to public for the Android 72 // Promote GetMaxBandwidthForConnectionSubtype to public for the Android
72 // delegate class. 73 // delegate class.
73 using NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype; 74 using NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype;
74 75
75 private: 76 private:
76 friend class NetworkChangeNotifierAndroidTest; 77 friend class NetworkChangeNotifierAndroidTest;
77 friend class NetworkChangeNotifierFactoryAndroid; 78 friend class NetworkChangeNotifierFactoryAndroid;
78 79
79 class DnsConfigServiceThread; 80 class DnsConfigServiceThread;
80 81
82 // Enable NetworkHandles support for tests.
83 void ForceNetworkHandlesSupportedForTesting();
84
81 NetworkChangeNotifierAndroid(NetworkChangeNotifierDelegateAndroid* delegate, 85 NetworkChangeNotifierAndroid(NetworkChangeNotifierDelegateAndroid* delegate,
82 const DnsConfig* dns_config_for_testing); 86 const DnsConfig* dns_config_for_testing);
83 87
84 static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsAndroid(); 88 static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsAndroid();
85 89
86 NetworkChangeNotifierDelegateAndroid* const delegate_; 90 NetworkChangeNotifierDelegateAndroid* const delegate_;
87 scoped_ptr<DnsConfigServiceThread> dns_config_service_thread_; 91 scoped_ptr<DnsConfigServiceThread> dns_config_service_thread_;
92 bool force_network_handles_supported_for_testing_;
88 93
89 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierAndroid); 94 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierAndroid);
90 }; 95 };
91 96
92 } // namespace net 97 } // namespace net
93 98
94 #endif // NET_ANDROID_NETWORK_CHANGE_NOTIFIER_ANDROID_H_ 99 #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