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

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: combined partner_bookmarks and bookmarks folder 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 {"MostVisitedSites", MostVisitedSites::Register}, 177 {"MostVisitedSites", MostVisitedSites::Register},
177 {"NativeInfoBar", RegisterNativeInfoBar}, 178 {"NativeInfoBar", RegisterNativeInfoBar},
178 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup}, 179 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup},
179 {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs}, 180 {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs},
180 {"NotificationUIManager", 181 {"NotificationUIManager",
181 NotificationUIManagerAndroid::RegisterNotificationUIManager}, 182 NotificationUIManagerAndroid::RegisterNotificationUIManager},
182 {"OmniboxPrerender", RegisterOmniboxPrerender}, 183 {"OmniboxPrerender", RegisterOmniboxPrerender},
183 {"OmniboxUrlEmphasizer", 184 {"OmniboxUrlEmphasizer",
184 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer}, 185 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer},
185 {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil}, 186 {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil},
187 {"PartnerBookmarksReader",
188 PartnerBookmarksReader::RegisterPartnerBookmarksReader},
186 {"PasswordGenerationPopup", 189 {"PasswordGenerationPopup",
187 autofill::PasswordGenerationPopupViewAndroid::Register}, 190 autofill::PasswordGenerationPopupViewAndroid::Register},
188 {"PasswordUIViewAndroid", 191 {"PasswordUIViewAndroid",
189 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid}, 192 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid},
190 {"PersonalDataManagerAndroid", 193 {"PersonalDataManagerAndroid",
191 autofill::PersonalDataManagerAndroid::Register}, 194 autofill::PersonalDataManagerAndroid::Register},
192 {"PrefServiceBridge", RegisterPrefServiceBridge}, 195 {"PrefServiceBridge", RegisterPrefServiceBridge},
193 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, 196 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid},
194 {"ProfileDownloader", RegisterProfileDownloader}, 197 {"ProfileDownloader", RegisterProfileDownloader},
195 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, 198 {"ProfileSyncService", ProfileSyncServiceAndroid::Register},
(...skipping 26 matching lines...) Expand all
222 }; 225 };
223 226
224 bool RegisterJni(JNIEnv* env) { 227 bool RegisterJni(JNIEnv* env) {
225 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 228 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
226 return RegisterNativeMethods(env, kChromeRegisteredMethods, 229 return RegisterNativeMethods(env, kChromeRegisteredMethods,
227 arraysize(kChromeRegisteredMethods)); 230 arraysize(kChromeRegisteredMethods));
228 } 231 }
229 232
230 } // namespace android 233 } // namespace android
231 } // namespace chrome 234 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698