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

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

Issue 1288903002: Refactor ShortcutHelper and merge in BookmarkUtils (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test file name 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/after_startup_task_utils_android.h" 10 #include "chrome/browser/after_startup_task_utils_android.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "chrome/browser/android/shortcut_helper.h" 70 #include "chrome/browser/android/shortcut_helper.h"
71 #include "chrome/browser/android/signin/account_management_screen_helper.h" 71 #include "chrome/browser/android/signin/account_management_screen_helper.h"
72 #include "chrome/browser/android/signin/signin_manager_android.h" 72 #include "chrome/browser/android/signin/signin_manager_android.h"
73 #include "chrome/browser/android/tab/thumbnail_tab_helper_android.h" 73 #include "chrome/browser/android/tab/thumbnail_tab_helper_android.h"
74 #include "chrome/browser/android/tab_android.h" 74 #include "chrome/browser/android/tab_android.h"
75 #include "chrome/browser/android/tab_state.h" 75 #include "chrome/browser/android/tab_state.h"
76 #include "chrome/browser/android/url_utilities.h" 76 #include "chrome/browser/android/url_utilities.h"
77 #include "chrome/browser/android/voice_search_tab_helper.h" 77 #include "chrome/browser/android/voice_search_tab_helper.h"
78 #include "chrome/browser/android/warmup_manager.h" 78 #include "chrome/browser/android/warmup_manager.h"
79 #include "chrome/browser/android/web_contents_factory.h" 79 #include "chrome/browser/android/web_contents_factory.h"
80 #include "chrome/browser/android/webapps/add_to_homescreen_dialog_helper.h"
80 #include "chrome/browser/autofill/android/personal_data_manager_android.h" 81 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
81 #include "chrome/browser/dom_distiller/dom_distiller_service_factory_android.h" 82 #include "chrome/browser/dom_distiller/dom_distiller_service_factory_android.h"
82 #include "chrome/browser/dom_distiller/tab_utils_android.h" 83 #include "chrome/browser/dom_distiller/tab_utils_android.h"
83 #include "chrome/browser/history/android/sqlite_cursor.h" 84 #include "chrome/browser/history/android/sqlite_cursor.h"
84 #include "chrome/browser/invalidation/invalidation_service_factory_android.h" 85 #include "chrome/browser/invalidation/invalidation_service_factory_android.h"
85 #include "chrome/browser/lifetime/application_lifetime_android.h" 86 #include "chrome/browser/lifetime/application_lifetime_android.h"
86 #include "chrome/browser/media/android/remote/record_cast_action.h" 87 #include "chrome/browser/media/android/remote/record_cast_action.h"
87 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" 88 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h"
88 #include "chrome/browser/media/android/router/media_router_android.h" 89 #include "chrome/browser/media/android/router/media_router_android.h"
89 #include "chrome/browser/media/android/router/media_router_dialog_controller_and roid.h" 90 #include "chrome/browser/media/android/router/media_router_dialog_controller_and roid.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 navigation_interception::RegisterNavigationInterceptionJni}, 165 navigation_interception::RegisterNavigationInterceptionJni},
165 {"Policy", policy::android::RegisterPolicy}, 166 {"Policy", policy::android::RegisterPolicy},
166 {"SafeJson", safe_json::android::RegisterSafeJsonJni}, 167 {"SafeJson", safe_json::android::RegisterSafeJsonJni},
167 {"Signin", signin::android::RegisterSigninJni}, 168 {"Signin", signin::android::RegisterSigninJni},
168 {"WebContentsDelegateAndroid", 169 {"WebContentsDelegateAndroid",
169 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni}, 170 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni},
170 // Register JNI for chrome classes. 171 // Register JNI for chrome classes.
171 {"AccessibilityUtils", AccessibilityUtil::Register}, 172 {"AccessibilityUtils", AccessibilityUtil::Register},
172 {"AccountChooserInfoBar", RegisterAccountChooserInfoBar}, 173 {"AccountChooserInfoBar", RegisterAccountChooserInfoBar},
173 {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register}, 174 {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register},
175 {"AddToHomescreenDialogHelper",
176 AddToHomescreenDialogHelper::RegisterAddToHomescreenDialogHelper},
174 {"AfterStartupTaskUtils", RegisterAfterStartupTaskUtilsJNI}, 177 {"AfterStartupTaskUtils", RegisterAfterStartupTaskUtilsJNI},
175 {"AnswersImageBridge", RegisterAnswersImageBridge}, 178 {"AnswersImageBridge", RegisterAnswersImageBridge},
176 {"AppBannerInfoBarAndroid", RegisterAppBannerInfoBarAndroid}, 179 {"AppBannerInfoBarAndroid", RegisterAppBannerInfoBarAndroid},
177 {"AppBannerInfoBarDelegateAndroid", 180 {"AppBannerInfoBarDelegateAndroid",
178 banners::RegisterAppBannerInfoBarDelegateAndroid}, 181 banners::RegisterAppBannerInfoBarDelegateAndroid},
179 {"AppBannerManagerAndroid", banners::AppBannerManagerAndroid::Register}, 182 {"AppBannerManagerAndroid", banners::AppBannerManagerAndroid::Register},
180 {"ApplicationLifetime", RegisterApplicationLifetimeAndroid}, 183 {"ApplicationLifetime", RegisterApplicationLifetimeAndroid},
181 {"AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid}, 184 {"AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid},
182 {"AutofillDialogControllerAndroid", 185 {"AutofillDialogControllerAndroid",
183 autofill::AutofillDialogControllerAndroid:: 186 autofill::AutofillDialogControllerAndroid::
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 }; 336 };
334 337
335 bool RegisterBrowserJNI(JNIEnv* env) { 338 bool RegisterBrowserJNI(JNIEnv* env) {
336 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 339 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
337 return RegisterNativeMethods(env, kChromeRegisteredMethods, 340 return RegisterNativeMethods(env, kChromeRegisteredMethods,
338 arraysize(kChromeRegisteredMethods)); 341 arraysize(kChromeRegisteredMethods));
339 } 342 }
340 343
341 } // namespace android 344 } // namespace android
342 } // namespace chrome 345 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698