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

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

Issue 2756173002: Move code about browsing data from PrefServiceBridge to BrowsingDataBridge. (Closed)
Patch Set: fix comments 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
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 "chrome/browser/after_startup_task_utils_android.h" 11 #include "chrome/browser/after_startup_task_utils_android.h"
12 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" 12 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
13 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" 13 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h"
14 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" 14 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
15 #include "chrome/browser/android/banners/app_banner_manager_android.h" 15 #include "chrome/browser/android/banners/app_banner_manager_android.h"
16 #include "chrome/browser/android/bookmarks/bookmark_bridge.h" 16 #include "chrome/browser/android/bookmarks/bookmark_bridge.h"
17 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h" 17 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
18 #include "chrome/browser/android/bottombar/overlay_panel_content.h" 18 #include "chrome/browser/android/bottombar/overlay_panel_content.h"
19 #include "chrome/browser/android/browsing_data/browsing_data_bridge.h"
19 #include "chrome/browser/android/browsing_data/browsing_data_counter_bridge.h" 20 #include "chrome/browser/android/browsing_data/browsing_data_counter_bridge.h"
20 #include "chrome/browser/android/browsing_data/url_filter_bridge.h" 21 #include "chrome/browser/android/browsing_data/url_filter_bridge.h"
21 #include "chrome/browser/android/chrome_application.h" 22 #include "chrome/browser/android/chrome_application.h"
22 #include "chrome/browser/android/chrome_backup_agent.h" 23 #include "chrome/browser/android/chrome_backup_agent.h"
23 #include "chrome/browser/android/chrome_feature_list.h" 24 #include "chrome/browser/android/chrome_feature_list.h"
24 #include "chrome/browser/android/compositor/compositor_view.h" 25 #include "chrome/browser/android/compositor/compositor_view.h"
25 #include "chrome/browser/android/compositor/layer_title_cache.h" 26 #include "chrome/browser/android/compositor/layer_title_cache.h"
26 #include "chrome/browser/android/compositor/resources/resource_factory.h" 27 #include "chrome/browser/android/compositor/resources/resource_factory.h"
27 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_ layer.h" 28 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_ layer.h"
28 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer. h" 29 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer. h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 {"AutofillSaveCardInfoBar", AutofillSaveCardInfoBar::Register}, 243 {"AutofillSaveCardInfoBar", AutofillSaveCardInfoBar::Register},
243 {"AutofillKeyboardAccessory", autofill::AutofillKeyboardAccessoryView:: 244 {"AutofillKeyboardAccessory", autofill::AutofillKeyboardAccessoryView::
244 RegisterAutofillKeyboardAccessoryView}, 245 RegisterAutofillKeyboardAccessoryView},
245 {"AutofillPopup", 246 {"AutofillPopup",
246 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, 247 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
247 {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge}, 248 {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge},
248 {"BackgroundSchedulerBridge", 249 {"BackgroundSchedulerBridge",
249 offline_pages::android::RegisterBackgroundSchedulerBridge}, 250 offline_pages::android::RegisterBackgroundSchedulerBridge},
250 {"BluetoothChooserAndroid", BluetoothChooserAndroid::Register}, 251 {"BluetoothChooserAndroid", BluetoothChooserAndroid::Register},
251 {"BookmarkBridge", BookmarkBridge::RegisterBookmarkBridge}, 252 {"BookmarkBridge", BookmarkBridge::RegisterBookmarkBridge},
253 {"BrowsingDataBridge", RegisterBrowsingDataBridge},
252 {"BrowsingDataCounterBridge", BrowsingDataCounterBridge::Register}, 254 {"BrowsingDataCounterBridge", BrowsingDataCounterBridge::Register},
253 {"BrowsingHistoryBridge", RegisterBrowsingHistoryBridge}, 255 {"BrowsingHistoryBridge", RegisterBrowsingHistoryBridge},
254 {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register}, 256 {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register},
255 {"CertificateViewer", RegisterCertificateViewer}, 257 {"CertificateViewer", RegisterCertificateViewer},
256 {"CertificateChainHelper", RegisterCertificateChainHelper}, 258 {"CertificateChainHelper", RegisterCertificateChainHelper},
257 {"ChildAccountService", RegisterChildAccountService}, 259 {"ChildAccountService", RegisterChildAccountService},
258 {"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings}, 260 {"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings},
259 {"ChromeBackupAgent", chrome::android::RegisterBackupAgent}, 261 {"ChromeBackupAgent", chrome::android::RegisterBackupAgent},
260 {"ChromeBrowserProvider", 262 {"ChromeBrowserProvider",
261 ChromeBrowserProvider::RegisterChromeBrowserProvider}, 263 ChromeBrowserProvider::RegisterChromeBrowserProvider},
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 #endif 451 #endif
450 }; 452 };
451 453
452 bool RegisterBrowserJNI(JNIEnv* env) { 454 bool RegisterBrowserJNI(JNIEnv* env) {
453 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 455 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
454 return RegisterNativeMethods(env, kChromeRegisteredMethods, 456 return RegisterNativeMethods(env, kChromeRegisteredMethods,
455 arraysize(kChromeRegisteredMethods)); 457 arraysize(kChromeRegisteredMethods));
456 } 458 }
457 459
458 } // namespace android 460 } // namespace android
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698