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

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

Issue 1270353003: [PresentationAPI, Android] Add ChromeMediaRouterDialogController.java and bind it with the native M… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media-router-jni
Patch Set: Disabled unnecessary DCHECK Created 5 years, 4 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/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "chrome/browser/android/web_contents_factory.h" 76 #include "chrome/browser/android/web_contents_factory.h"
77 #include "chrome/browser/autofill/android/personal_data_manager_android.h" 77 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
78 #include "chrome/browser/dom_distiller/dom_distiller_service_factory_android.h" 78 #include "chrome/browser/dom_distiller/dom_distiller_service_factory_android.h"
79 #include "chrome/browser/dom_distiller/tab_utils_android.h" 79 #include "chrome/browser/dom_distiller/tab_utils_android.h"
80 #include "chrome/browser/history/android/sqlite_cursor.h" 80 #include "chrome/browser/history/android/sqlite_cursor.h"
81 #include "chrome/browser/invalidation/invalidation_service_factory_android.h" 81 #include "chrome/browser/invalidation/invalidation_service_factory_android.h"
82 #include "chrome/browser/lifetime/application_lifetime_android.h" 82 #include "chrome/browser/lifetime/application_lifetime_android.h"
83 #include "chrome/browser/media/android/remote/record_cast_action.h" 83 #include "chrome/browser/media/android/remote/record_cast_action.h"
84 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" 84 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h"
85 #include "chrome/browser/media/android/router/media_router_android.h" 85 #include "chrome/browser/media/android/router/media_router_android.h"
86 #include "chrome/browser/media/android/router/media_router_dialog_controller_and roid.h"
86 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 87 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
87 #include "chrome/browser/notifications/notification_ui_manager_android.h" 88 #include "chrome/browser/notifications/notification_ui_manager_android.h"
88 #include "chrome/browser/password_manager/credential_android.h" 89 #include "chrome/browser/password_manager/credential_android.h"
89 #include "chrome/browser/permissions/permission_update_infobar_delegate_android. h" 90 #include "chrome/browser/permissions/permission_update_infobar_delegate_android. h"
90 #include "chrome/browser/prerender/external_prerender_handler_android.h" 91 #include "chrome/browser/prerender/external_prerender_handler_android.h"
91 #include "chrome/browser/profiles/profile_android.h" 92 #include "chrome/browser/profiles/profile_android.h"
92 #include "chrome/browser/search_engines/template_url_service_android.h" 93 #include "chrome/browser/search_engines/template_url_service_android.h"
93 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" 94 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
94 #include "chrome/browser/speech/tts_android.h" 95 #include "chrome/browser/speech/tts_android.h"
95 #include "chrome/browser/ssl/connection_security_android.h" 96 #include "chrome/browser/ssl/connection_security_android.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 {"CertificateViewer", RegisterCertificateViewer}, 190 {"CertificateViewer", RegisterCertificateViewer},
190 {"ChildAccountFeedbackReporter", RegisterChildAccountFeedbackReporter}, 191 {"ChildAccountFeedbackReporter", RegisterChildAccountFeedbackReporter},
191 {"ChildAccountService", RegisterChildAccountService}, 192 {"ChildAccountService", RegisterChildAccountService},
192 {"ChromeApplication", ChromeApplication::RegisterBindings}, 193 {"ChromeApplication", ChromeApplication::RegisterBindings},
193 {"ChromeBrowserProvider", 194 {"ChromeBrowserProvider",
194 ChromeBrowserProvider::RegisterChromeBrowserProvider}, 195 ChromeBrowserProvider::RegisterChromeBrowserProvider},
195 {"ChromeHttpAuthHandler", 196 {"ChromeHttpAuthHandler",
196 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, 197 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},
197 #if defined(ENABLE_MEDIA_ROUTER) 198 #if defined(ENABLE_MEDIA_ROUTER)
198 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register}, 199 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register},
200 {"ChromeMediaRouterDialogController",
201 media_router::MediaRouterDialogControllerAndroid::Register},
199 #endif 202 #endif
200 {"ChromeWebContentsDelegateAndroid", 203 {"ChromeWebContentsDelegateAndroid",
201 RegisterChromeWebContentsDelegateAndroid}, 204 RegisterChromeWebContentsDelegateAndroid},
202 {"CompositorView", RegisterCompositorView}, 205 {"CompositorView", RegisterCompositorView},
203 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, 206 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},
204 {"ConnectionInfoPopupAndroid", 207 {"ConnectionInfoPopupAndroid",
205 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, 208 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid},
206 {"ConnectionSecurity", RegisterConnectionSecurityAndroid}, 209 {"ConnectionSecurity", RegisterConnectionSecurityAndroid},
207 {"ConnectivityChecker", RegisterConnectivityChecker}, 210 {"ConnectivityChecker", RegisterConnectivityChecker},
208 {"ContextMenuHelper", RegisterContextMenuHelper}, 211 {"ContextMenuHelper", RegisterContextMenuHelper},
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 }; 324 };
322 325
323 bool RegisterBrowserJNI(JNIEnv* env) { 326 bool RegisterBrowserJNI(JNIEnv* env) {
324 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 327 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
325 return RegisterNativeMethods(env, kChromeRegisteredMethods, 328 return RegisterNativeMethods(env, kChromeRegisteredMethods,
326 arraysize(kChromeRegisteredMethods)); 329 arraysize(kChromeRegisteredMethods));
327 } 330 }
328 331
329 } // namespace android 332 } // namespace android
330 } // namespace chrome 333 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698