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

Side by Side Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: . Created 3 years, 8 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 | « chrome/browser/about_flags.cc ('k') | chrome/browser/browser_resources.grd » ('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 "chrome/browser/android/chrome_jni_registrar.h" 5 #include "chrome/browser/android/chrome_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 {"CertificateViewer", RegisterCertificateViewer}, 262 {"CertificateViewer", RegisterCertificateViewer},
263 {"CertificateChainHelper", RegisterCertificateChainHelper}, 263 {"CertificateChainHelper", RegisterCertificateChainHelper},
264 {"ChildAccountService", RegisterChildAccountService}, 264 {"ChildAccountService", RegisterChildAccountService},
265 {"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings}, 265 {"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings},
266 {"ChromeBackupAgent", chrome::android::RegisterBackupAgent}, 266 {"ChromeBackupAgent", chrome::android::RegisterBackupAgent},
267 {"ChromeBrowserProvider", 267 {"ChromeBrowserProvider",
268 ChromeBrowserProvider::RegisterChromeBrowserProvider}, 268 ChromeBrowserProvider::RegisterChromeBrowserProvider},
269 {"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni}, 269 {"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni},
270 {"ChromeHttpAuthHandler", 270 {"ChromeHttpAuthHandler",
271 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, 271 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},
272 #if defined(ENABLE_MEDIA_ROUTER)
273 {"ChromeMediaRouter", media_router::MediaRouterAndroidBridge::Register}, 272 {"ChromeMediaRouter", media_router::MediaRouterAndroidBridge::Register},
274 {"ChromeMediaRouterDialogController", 273 {"ChromeMediaRouterDialogController",
275 media_router::MediaRouterDialogControllerAndroid::Register}, 274 media_router::MediaRouterDialogControllerAndroid::Register},
276 #endif
277 {"ChromePayments", payments::android::RegisterChromePayments}, 275 {"ChromePayments", payments::android::RegisterChromePayments},
278 {"ChromeWebApkHost", ChromeWebApkHost::Register}, 276 {"ChromeWebApkHost", ChromeWebApkHost::Register},
279 {"CompositorView", RegisterCompositorView}, 277 {"CompositorView", RegisterCompositorView},
280 {"ConnectionInfoPopupAndroid", 278 {"ConnectionInfoPopupAndroid",
281 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, 279 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid},
282 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, 280 {"SecurityStateModel", RegisterSecurityStateModelAndroid},
283 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker}, 281 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker},
284 {"ContentSuggestionsNotificationHelper", 282 {"ContentSuggestionsNotificationHelper",
285 ntp_snippets::ContentSuggestionsNotificationHelper::Register}, 283 ntp_snippets::ContentSuggestionsNotificationHelper::Register},
286 {"ContextMenuHelper", RegisterContextMenuHelper}, 284 {"ContextMenuHelper", RegisterContextMenuHelper},
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 #endif 455 #endif
458 }; 456 };
459 457
460 bool RegisterBrowserJNI(JNIEnv* env) { 458 bool RegisterBrowserJNI(JNIEnv* env) {
461 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 459 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
462 return RegisterNativeMethods(env, kChromeRegisteredMethods, 460 return RegisterNativeMethods(env, kChromeRegisteredMethods,
463 arraysize(kChromeRegisteredMethods)); 461 arraysize(kChromeRegisteredMethods));
464 } 462 }
465 463
466 } // namespace android 464 } // namespace android
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698