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

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

Issue 2623023002: Remove //chrome as an embedder of blimp. (Closed)
Patch Set: One more rebase for good measure Created 3 years, 11 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"
11 #include "blimp/client/public/android/blimp_jni_registrar.h"
12 #include "chrome/browser/after_startup_task_utils_android.h" 11 #include "chrome/browser/after_startup_task_utils_android.h"
13 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" 12 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
14 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" 13 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h"
15 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" 14 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
16 #include "chrome/browser/android/banners/app_banner_manager_android.h" 15 #include "chrome/browser/android/banners/app_banner_manager_android.h"
17 #include "chrome/browser/android/blimp/blimp_client_context_factory_android.h"
18 #include "chrome/browser/android/blimp/chrome_blimp_client_context_delegate_andr oid.h"
19 #include "chrome/browser/android/bookmarks/bookmark_bridge.h" 16 #include "chrome/browser/android/bookmarks/bookmark_bridge.h"
20 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h" 17 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
21 #include "chrome/browser/android/bottombar/overlay_panel_content.h" 18 #include "chrome/browser/android/bottombar/overlay_panel_content.h"
22 #include "chrome/browser/android/browsing_data/browsing_data_counter_bridge.h" 19 #include "chrome/browser/android/browsing_data/browsing_data_counter_bridge.h"
23 #include "chrome/browser/android/browsing_data/url_filter_bridge.h" 20 #include "chrome/browser/android/browsing_data/url_filter_bridge.h"
24 #include "chrome/browser/android/chrome_application.h" 21 #include "chrome/browser/android/chrome_application.h"
25 #include "chrome/browser/android/chrome_backup_agent.h" 22 #include "chrome/browser/android/chrome_backup_agent.h"
26 #include "chrome/browser/android/chrome_feature_list.h" 23 #include "chrome/browser/android/chrome_feature_list.h"
27 #include "chrome/browser/android/compositor/compositor_view.h" 24 #include "chrome/browser/android/compositor/compositor_view.h"
28 #include "chrome/browser/android/compositor/layer_title_cache.h" 25 #include "chrome/browser/android/compositor/layer_title_cache.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 {"AppBannerManagerAndroid", banners::AppBannerManagerAndroid::Register}, 228 {"AppBannerManagerAndroid", banners::AppBannerManagerAndroid::Register},
232 {"AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid}, 229 {"AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid},
233 {"AutofillSaveCardInfoBar", AutofillSaveCardInfoBar::Register}, 230 {"AutofillSaveCardInfoBar", AutofillSaveCardInfoBar::Register},
234 {"AutofillKeyboardAccessory", autofill::AutofillKeyboardAccessoryView:: 231 {"AutofillKeyboardAccessory", autofill::AutofillKeyboardAccessoryView::
235 RegisterAutofillKeyboardAccessoryView}, 232 RegisterAutofillKeyboardAccessoryView},
236 {"AutofillPopup", 233 {"AutofillPopup",
237 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, 234 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
238 {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge}, 235 {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge},
239 {"BackgroundSchedulerBridge", 236 {"BackgroundSchedulerBridge",
240 offline_pages::android::RegisterBackgroundSchedulerBridge}, 237 offline_pages::android::RegisterBackgroundSchedulerBridge},
241 {"BlimpClientContextFactory", RegisterBlimpClientContextFactoryJni},
242 {"Blimp", blimp::client::RegisterBlimpJni},
243 {"BluetoothChooserAndroid", BluetoothChooserAndroid::Register}, 238 {"BluetoothChooserAndroid", BluetoothChooserAndroid::Register},
244 {"BookmarkBridge", BookmarkBridge::RegisterBookmarkBridge}, 239 {"BookmarkBridge", BookmarkBridge::RegisterBookmarkBridge},
245 {"BrowsingDataCounterBridge", BrowsingDataCounterBridge::Register}, 240 {"BrowsingDataCounterBridge", BrowsingDataCounterBridge::Register},
246 {"BrowsingHistoryBridge", RegisterBrowsingHistoryBridge}, 241 {"BrowsingHistoryBridge", RegisterBrowsingHistoryBridge},
247 {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register}, 242 {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register},
248 {"CertificateViewer", RegisterCertificateViewer}, 243 {"CertificateViewer", RegisterCertificateViewer},
249 {"CertificateChainHelper", RegisterCertificateChainHelper}, 244 {"CertificateChainHelper", RegisterCertificateChainHelper},
250 {"ChildAccountService", RegisterChildAccountService}, 245 {"ChildAccountService", RegisterChildAccountService},
251 {"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings}, 246 {"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings},
252 {"ChromeBackupAgent", chrome::android::RegisterBackupAgent}, 247 {"ChromeBackupAgent", chrome::android::RegisterBackupAgent},
253 {"ChromeBlimpClientContextDelegate",
254 ChromeBlimpClientContextDelegateAndroid::RegisterJni},
255 {"ChromeBrowserProvider", 248 {"ChromeBrowserProvider",
256 ChromeBrowserProvider::RegisterChromeBrowserProvider}, 249 ChromeBrowserProvider::RegisterChromeBrowserProvider},
257 {"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni}, 250 {"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni},
258 {"ChromeHttpAuthHandler", 251 {"ChromeHttpAuthHandler",
259 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, 252 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},
260 #if defined(ENABLE_MEDIA_ROUTER) 253 #if defined(ENABLE_MEDIA_ROUTER)
261 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register}, 254 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register},
262 {"ChromeMediaRouterDialogController", 255 {"ChromeMediaRouterDialogController",
263 media_router::MediaRouterDialogControllerAndroid::Register}, 256 media_router::MediaRouterDialogControllerAndroid::Register},
264 #endif 257 #endif
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 #endif 428 #endif
436 }; 429 };
437 430
438 bool RegisterBrowserJNI(JNIEnv* env) { 431 bool RegisterBrowserJNI(JNIEnv* env) {
439 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 432 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
440 return RegisterNativeMethods(env, kChromeRegisteredMethods, 433 return RegisterNativeMethods(env, kChromeRegisteredMethods,
441 arraysize(kChromeRegisteredMethods)); 434 arraysize(kChromeRegisteredMethods));
442 } 435 }
443 436
444 } // namespace android 437 } // namespace android
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698