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

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

Issue 839663003: Upstream partner customizations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed tests Created 5 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/debug/trace_event.h" 9 #include "base/debug/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"
11 #include "chrome/browser/android/accessibility_util.h" 11 #include "chrome/browser/android/accessibility_util.h"
12 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" 12 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h"
13 #include "chrome/browser/android/banners/app_banner_manager.h" 13 #include "chrome/browser/android/banners/app_banner_manager.h"
14 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" 14 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
15 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
15 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 16 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
16 #include "chrome/browser/android/chromium_application.h" 17 #include "chrome/browser/android/chromium_application.h"
17 #include "chrome/browser/android/compositor/layer_title_cache.h" 18 #include "chrome/browser/android/compositor/layer_title_cache.h"
18 #include "chrome/browser/android/compositor/tab_content_manager.h" 19 #include "chrome/browser/android/compositor/tab_content_manager.h"
19 #include "chrome/browser/android/content_view_util.h" 20 #include "chrome/browser/android/content_view_util.h"
20 #include "chrome/browser/android/dev_tools_server.h" 21 #include "chrome/browser/android/dev_tools_server.h"
21 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h" 22 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h"
22 #include "chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h" 23 #include "chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h"
23 #include "chrome/browser/android/favicon_helper.h" 24 #include "chrome/browser/android/favicon_helper.h"
24 #include "chrome/browser/android/feature_utilities.h" 25 #include "chrome/browser/android/feature_utilities.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 {"MostVisitedSites", MostVisitedSites::Register}, 179 {"MostVisitedSites", MostVisitedSites::Register},
179 {"NativeInfoBar", RegisterNativeInfoBar}, 180 {"NativeInfoBar", RegisterNativeInfoBar},
180 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup}, 181 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup},
181 {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs}, 182 {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs},
182 {"NotificationUIManager", 183 {"NotificationUIManager",
183 NotificationUIManagerAndroid::RegisterNotificationUIManager}, 184 NotificationUIManagerAndroid::RegisterNotificationUIManager},
184 {"OmniboxPrerender", RegisterOmniboxPrerender}, 185 {"OmniboxPrerender", RegisterOmniboxPrerender},
185 {"OmniboxUrlEmphasizer", 186 {"OmniboxUrlEmphasizer",
186 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer}, 187 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer},
187 {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil}, 188 {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil},
189 {"PartnerBookmarksReader",
190 PartnerBookmarksReader::RegisterPartnerBookmarksReader},
188 {"PasswordGenerationPopup", 191 {"PasswordGenerationPopup",
189 autofill::PasswordGenerationPopupViewAndroid::Register}, 192 autofill::PasswordGenerationPopupViewAndroid::Register},
190 {"PasswordUIViewAndroid", 193 {"PasswordUIViewAndroid",
191 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid}, 194 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid},
192 {"PersonalDataManagerAndroid", 195 {"PersonalDataManagerAndroid",
193 autofill::PersonalDataManagerAndroid::Register}, 196 autofill::PersonalDataManagerAndroid::Register},
194 {"PrefServiceBridge", RegisterPrefServiceBridge}, 197 {"PrefServiceBridge", RegisterPrefServiceBridge},
195 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, 198 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid},
196 {"ProfileDownloader", RegisterProfileDownloader}, 199 {"ProfileDownloader", RegisterProfileDownloader},
197 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, 200 {"ProfileSyncService", ProfileSyncServiceAndroid::Register},
(...skipping 26 matching lines...) Expand all
224 }; 227 };
225 228
226 bool RegisterJni(JNIEnv* env) { 229 bool RegisterJni(JNIEnv* env) {
227 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 230 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
228 return RegisterNativeMethods(env, kChromeRegisteredMethods, 231 return RegisterNativeMethods(env, kChromeRegisteredMethods,
229 arraysize(kChromeRegisteredMethods)); 232 arraysize(kChromeRegisteredMethods));
230 } 233 }
231 234
232 } // namespace android 235 } // namespace android
233 } // namespace chrome 236 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/android/bookmarks/partner_bookmarks_reader.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698