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

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

Issue 459973004: [Android] EnhancedBookmarksBridge for bookmark description read&write. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added back missing bookmark_type_list.h bookmark_type.h Created 6 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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "chrome/browser/android/accessibility_util.h" 10 #include "chrome/browser/android/accessibility_util.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "chrome/browser/ui/android/infobars/save_password_infobar.h" 64 #include "chrome/browser/ui/android/infobars/save_password_infobar.h"
65 #include "chrome/browser/ui/android/infobars/translate_infobar.h" 65 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
66 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 66 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
67 #include "chrome/browser/ui/android/navigation_popup.h" 67 #include "chrome/browser/ui/android/navigation_popup.h"
68 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" 68 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
69 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 69 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
70 #include "chrome/browser/ui/android/tab_model/tab_model_base.h" 70 #include "chrome/browser/ui/android/tab_model/tab_model_base.h"
71 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" 71 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
72 #include "chrome/browser/ui/android/website_settings_popup_android.h" 72 #include "chrome/browser/ui/android/website_settings_popup_android.h"
73 #include "components/autofill/core/browser/android/component_jni_registrar.h" 73 #include "components/autofill/core/browser/android/component_jni_registrar.h"
74 #include "components/bookmarks/common/android/component_jni_registrar.h"
74 #include "components/dom_distiller/android/component_jni_registrar.h" 75 #include "components/dom_distiller/android/component_jni_registrar.h"
76 #include "components/enhanced_bookmarks/android/component_jni_registrar.h"
75 #include "components/gcm_driver/android/component_jni_registrar.h" 77 #include "components/gcm_driver/android/component_jni_registrar.h"
76 #include "components/navigation_interception/component_jni_registrar.h" 78 #include "components/navigation_interception/component_jni_registrar.h"
77 #include "components/variations/android/component_jni_registrar.h" 79 #include "components/variations/android/component_jni_registrar.h"
78 #include "components/web_contents_delegate_android/component_jni_registrar.h" 80 #include "components/web_contents_delegate_android/component_jni_registrar.h"
79 81
80 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) 82 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING)
81 #include "printing/printing_context_android.h" 83 #include "printing/printing_context_android.h"
82 #endif 84 #endif
83 85
84 bool RegisterCertificateViewer(JNIEnv* env); 86 bool RegisterCertificateViewer(JNIEnv* env);
85 87
86 namespace chrome { 88 namespace chrome {
87 namespace android { 89 namespace android {
88 90
89 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 91 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
90 // Register JNI for components we depend on. 92 // Register JNI for components we depend on.
93 { "Bookmarks", bookmarks::android::RegisterBookmarks },
91 { "DomDistiller", dom_distiller::android::RegisterDomDistiller }, 94 { "DomDistiller", dom_distiller::android::RegisterDomDistiller },
95 { "EnhancedBookmarks",
96 enhanced_bookmarks::android::RegisterEnhancedBookmarks },
92 { "GCMDriver", gcm::android::RegisterGCMDriverJni }, 97 { "GCMDriver", gcm::android::RegisterGCMDriverJni },
93 { "NavigationInterception", 98 { "NavigationInterception",
94 navigation_interception::RegisterNavigationInterceptionJni }, 99 navigation_interception::RegisterNavigationInterceptionJni },
95 { "WebContentsDelegateAndroid", 100 { "WebContentsDelegateAndroid",
96 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni }, 101 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni },
97 { "RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni }, 102 { "RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni },
98 // Register JNI for chrome classes. 103 // Register JNI for chrome classes.
99 { "AccessibilityUtils", AccessibilityUtil::Register }, 104 { "AccessibilityUtils", AccessibilityUtil::Register },
100 { "AccountManagementScreenHelper", AccountManagementScreenHelper::Register }, 105 { "AccountManagementScreenHelper", AccountManagementScreenHelper::Register },
101 { "AndroidProfileOAuth2TokenService", 106 { "AndroidProfileOAuth2TokenService",
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 }; 193 };
189 194
190 bool RegisterJni(JNIEnv* env) { 195 bool RegisterJni(JNIEnv* env) {
191 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 196 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
192 return RegisterNativeMethods(env, kChromeRegisteredMethods, 197 return RegisterNativeMethods(env, kChromeRegisteredMethods,
193 arraysize(kChromeRegisteredMethods)); 198 arraysize(kChromeRegisteredMethods));
194 } 199 }
195 200
196 } // namespace android 201 } // namespace android
197 } // namespace chrome 202 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698