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

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

Issue 928643003: Upstream Chrome for Android Cast. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes for bauerb@'s and scherkus@'s comments Created 5 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/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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "chrome/browser/android/transition_page_helper.h" 57 #include "chrome/browser/android/transition_page_helper.h"
58 #include "chrome/browser/android/url_utilities.h" 58 #include "chrome/browser/android/url_utilities.h"
59 #include "chrome/browser/android/voice_search_tab_helper.h" 59 #include "chrome/browser/android/voice_search_tab_helper.h"
60 #include "chrome/browser/autofill/android/personal_data_manager_android.h" 60 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
61 #include "chrome/browser/dom_distiller/dom_distiller_service_factory_android.h" 61 #include "chrome/browser/dom_distiller/dom_distiller_service_factory_android.h"
62 #include "chrome/browser/dom_distiller/tab_utils_android.h" 62 #include "chrome/browser/dom_distiller/tab_utils_android.h"
63 #include "chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h" 63 #include "chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h"
64 #include "chrome/browser/history/android/sqlite_cursor.h" 64 #include "chrome/browser/history/android/sqlite_cursor.h"
65 #include "chrome/browser/invalidation/invalidation_service_factory_android.h" 65 #include "chrome/browser/invalidation/invalidation_service_factory_android.h"
66 #include "chrome/browser/lifetime/application_lifetime_android.h" 66 #include "chrome/browser/lifetime/application_lifetime_android.h"
67 #include "chrome/browser/media/android/remote/record_cast_action.h"
68 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h"
67 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 69 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
68 #include "chrome/browser/notifications/notification_ui_manager_android.h" 70 #include "chrome/browser/notifications/notification_ui_manager_android.h"
69 #include "chrome/browser/prerender/external_prerender_handler_android.h" 71 #include "chrome/browser/prerender/external_prerender_handler_android.h"
70 #include "chrome/browser/profiles/profile_android.h" 72 #include "chrome/browser/profiles/profile_android.h"
71 #include "chrome/browser/search_engines/template_url_service_android.h" 73 #include "chrome/browser/search_engines/template_url_service_android.h"
72 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 74 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
73 #include "chrome/browser/speech/tts_android.h" 75 #include "chrome/browser/speech/tts_android.h"
74 #include "chrome/browser/supervised_user/child_accounts/child_account_feedback_r eporter_android.h" 76 #include "chrome/browser/supervised_user/child_accounts/child_account_feedback_r eporter_android.h"
75 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h" 77 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h"
76 #include "chrome/browser/sync/profile_sync_service_android.h" 78 #include "chrome/browser/sync/profile_sync_service_android.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 autofill::PasswordGenerationPopupViewAndroid::Register}, 216 autofill::PasswordGenerationPopupViewAndroid::Register},
215 {"PasswordUIViewAndroid", 217 {"PasswordUIViewAndroid",
216 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid}, 218 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid},
217 {"PersonalDataManagerAndroid", 219 {"PersonalDataManagerAndroid",
218 autofill::PersonalDataManagerAndroid::Register}, 220 autofill::PersonalDataManagerAndroid::Register},
219 {"PrefServiceBridge", RegisterPrefServiceBridge}, 221 {"PrefServiceBridge", RegisterPrefServiceBridge},
220 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, 222 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid},
221 {"ProfileDownloader", RegisterProfileDownloader}, 223 {"ProfileDownloader", RegisterProfileDownloader},
222 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, 224 {"ProfileSyncService", ProfileSyncServiceAndroid::Register},
223 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, 225 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register},
226 {"RecordCastAction", remote_media::RegisterRecordCastAction},
227 {"RemoteMediaPlayerBridge",
228 remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge},
224 {"SavePasswordInfoBar", SavePasswordInfoBar::Register}, 229 {"SavePasswordInfoBar", SavePasswordInfoBar::Register},
225 {"SceneLayer", chrome::android::RegisterSceneLayer}, 230 {"SceneLayer", chrome::android::RegisterSceneLayer},
226 {"ServiceTabLauncher", ServiceTabLauncher::RegisterServiceTabLauncher}, 231 {"ServiceTabLauncher", ServiceTabLauncher::RegisterServiceTabLauncher},
227 {"SigninManager", SigninManagerAndroid::Register}, 232 {"SigninManager", SigninManagerAndroid::Register},
228 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, 233 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
229 {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid}, 234 {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid},
230 {"StartupMetricUtils", RegisterStartupMetricUtils}, 235 {"StartupMetricUtils", RegisterStartupMetricUtils},
231 {"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer}, 236 {"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer},
232 {"TabAndroid", TabAndroid::RegisterTabAndroid}, 237 {"TabAndroid", TabAndroid::RegisterTabAndroid},
233 {"TabContentManager", chrome::android::RegisterTabContentManager}, 238 {"TabContentManager", chrome::android::RegisterTabContentManager},
(...skipping 18 matching lines...) Expand all
252 }; 257 };
253 258
254 bool RegisterBrowserJNI(JNIEnv* env) { 259 bool RegisterBrowserJNI(JNIEnv* env) {
255 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 260 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
256 return RegisterNativeMethods(env, kChromeRegisteredMethods, 261 return RegisterNativeMethods(env, kChromeRegisteredMethods,
257 arraysize(kChromeRegisteredMethods)); 262 arraysize(kChromeRegisteredMethods));
258 } 263 }
259 264
260 } // namespace android 265 } // namespace android
261 } // namespace chrome 266 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698