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

Side by Side Diff: net/android/net_jni_registrar.cc

Issue 10384025: fix duplicated basename network_change_notifier.cc in net target (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | net/android/network_change_notifier.h » ('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 #include "net/android/net_jni_registrar.h" 5 #include "net/android/net_jni_registrar.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_registrar.h" 9 #include "base/android/jni_registrar.h"
10 #include "net/android/network_library.h" 10 #include "net/android/network_library.h"
11 #include "net/android/network_change_notifier.h" 11 #include "net/android/network_change_notifier_android.h"
12 12
13 namespace net { 13 namespace net {
14 namespace android { 14 namespace android {
15 15
16 static base::android::RegistrationMethod kNetRegisteredMethods[] = { 16 static base::android::RegistrationMethod kNetRegisteredMethods[] = {
17 { "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary }, 17 { "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary },
18 { "NetworkChangeNotifier", net::android::NetworkChangeNotifier::Register }, 18 { "NetworkChangeNotifier", net::android::NetworkChangeNotifier::Register },
19 }; 19 };
20 20
21 bool RegisterJni(JNIEnv* env) { 21 bool RegisterJni(JNIEnv* env) {
22 return base::android::RegisterNativeMethods( 22 return base::android::RegisterNativeMethods(
23 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); 23 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods));
24 } 24 }
25 25
26 } // namespace android 26 } // namespace android
27 } // namespace net 27 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/android/network_change_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698