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

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

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: Created 3 years, 9 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 (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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 {"CertificateViewer", RegisterCertificateViewer}, 254 {"CertificateViewer", RegisterCertificateViewer},
255 {"CertificateChainHelper", RegisterCertificateChainHelper}, 255 {"CertificateChainHelper", RegisterCertificateChainHelper},
256 {"ChildAccountService", RegisterChildAccountService}, 256 {"ChildAccountService", RegisterChildAccountService},
257 {"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings}, 257 {"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings},
258 {"ChromeBackupAgent", chrome::android::RegisterBackupAgent}, 258 {"ChromeBackupAgent", chrome::android::RegisterBackupAgent},
259 {"ChromeBrowserProvider", 259 {"ChromeBrowserProvider",
260 ChromeBrowserProvider::RegisterChromeBrowserProvider}, 260 ChromeBrowserProvider::RegisterChromeBrowserProvider},
261 {"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni}, 261 {"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni},
262 {"ChromeHttpAuthHandler", 262 {"ChromeHttpAuthHandler",
263 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, 263 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},
264 #if defined(ENABLE_MEDIA_ROUTER)
265 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register}, 264 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register},
266 {"ChromeMediaRouterDialogController", 265 {"ChromeMediaRouterDialogController",
267 media_router::MediaRouterDialogControllerAndroid::Register}, 266 media_router::MediaRouterDialogControllerAndroid::Register},
268 #endif
269 {"ChromeWebApkHost", ChromeWebApkHost::Register}, 267 {"ChromeWebApkHost", ChromeWebApkHost::Register},
270 {"CompositorView", RegisterCompositorView}, 268 {"CompositorView", RegisterCompositorView},
271 {"ConnectionInfoPopupAndroid", 269 {"ConnectionInfoPopupAndroid",
272 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, 270 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid},
273 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, 271 {"SecurityStateModel", RegisterSecurityStateModelAndroid},
274 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker}, 272 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker},
275 {"ContentSuggestionsNotificationHelper", 273 {"ContentSuggestionsNotificationHelper",
276 ntp_snippets::ContentSuggestionsNotificationHelper::Register}, 274 ntp_snippets::ContentSuggestionsNotificationHelper::Register},
277 {"ContextMenuHelper", RegisterContextMenuHelper}, 275 {"ContextMenuHelper", RegisterContextMenuHelper},
278 {"ContextualSearchContext", RegisterContextualSearchContext}, 276 {"ContextualSearchContext", RegisterContextualSearchContext},
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 #endif 445 #endif
448 }; 446 };
449 447
450 bool RegisterBrowserJNI(JNIEnv* env) { 448 bool RegisterBrowserJNI(JNIEnv* env) {
451 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 449 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
452 return RegisterNativeMethods(env, kChromeRegisteredMethods, 450 return RegisterNativeMethods(env, kChromeRegisteredMethods,
453 arraysize(kChromeRegisteredMethods)); 451 arraysize(kChromeRegisteredMethods));
454 } 452 }
455 453
456 } // namespace android 454 } // namespace android
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698