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

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

Issue 1220683008: Move AppRestriction to Policy code out of //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 5 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/android/accessibility/font_size_prefs_android.h" 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 125 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
126 #include "chrome/browser/ui/android/tab_model/single_tab_model.h" 126 #include "chrome/browser/ui/android/tab_model/single_tab_model.h"
127 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h" 127 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
128 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" 128 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
129 #include "chrome/browser/ui/android/website_settings_popup_android.h" 129 #include "chrome/browser/ui/android/website_settings_popup_android.h"
130 #include "components/bookmarks/common/android/component_jni_registrar.h" 130 #include "components/bookmarks/common/android/component_jni_registrar.h"
131 #include "components/dom_distiller/android/component_jni_registrar.h" 131 #include "components/dom_distiller/android/component_jni_registrar.h"
132 #include "components/gcm_driver/android/component_jni_registrar.h" 132 #include "components/gcm_driver/android/component_jni_registrar.h"
133 #include "components/invalidation/impl/android/component_jni_registrar.h" 133 #include "components/invalidation/impl/android/component_jni_registrar.h"
134 #include "components/navigation_interception/component_jni_registrar.h" 134 #include "components/navigation_interception/component_jni_registrar.h"
135 #include "components/policy/core/browser/android/component_jni_registrar.h"
135 #include "components/safe_json/android/component_jni_registrar.h" 136 #include "components/safe_json/android/component_jni_registrar.h"
136 #include "components/service_tab_launcher/component_jni_registrar.h" 137 #include "components/service_tab_launcher/component_jni_registrar.h"
137 #include "components/variations/android/component_jni_registrar.h" 138 #include "components/variations/android/component_jni_registrar.h"
138 #include "components/web_contents_delegate_android/component_jni_registrar.h" 139 #include "components/web_contents_delegate_android/component_jni_registrar.h"
139 140
140 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 141 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
141 #include "printing/printing_context_android.h" 142 #include "printing/printing_context_android.h"
142 #endif 143 #endif
143 144
144 namespace chrome { 145 namespace chrome {
145 namespace android { 146 namespace android {
146 147
147 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 148 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
148 // Register JNI for components we depend on. 149 // Register JNI for components we depend on.
149 {"AppMenuDragHelper", RegisterAppMenuDragHelper}, 150 {"AppMenuDragHelper", RegisterAppMenuDragHelper},
150 {"Bookmarks", bookmarks::android::RegisterBookmarks}, 151 {"Bookmarks", bookmarks::android::RegisterBookmarks},
151 {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, 152 {"DomDistiller", dom_distiller::android::RegisterDomDistiller},
152 {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate}, 153 {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate},
153 {"GCMDriver", gcm::android::RegisterGCMDriverJni}, 154 {"GCMDriver", gcm::android::RegisterGCMDriverJni},
154 {"Invalidation", invalidation::android::RegisterInvalidationJni}, 155 {"Invalidation", invalidation::android::RegisterInvalidationJni},
155 {"NavigationInterception", 156 {"NavigationInterception",
156 navigation_interception::RegisterNavigationInterceptionJni}, 157 navigation_interception::RegisterNavigationInterceptionJni},
158 {"Policy", policy::android::RegisterPolicy},
157 {"SafeJson", safe_json::android::RegisterSafeJsonJni}, 159 {"SafeJson", safe_json::android::RegisterSafeJsonJni},
158 {"WebContentsDelegateAndroid", 160 {"WebContentsDelegateAndroid",
159 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni}, 161 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni},
160 // Register JNI for chrome classes. 162 // Register JNI for chrome classes.
161 {"AccessibilityUtils", AccessibilityUtil::Register}, 163 {"AccessibilityUtils", AccessibilityUtil::Register},
162 {"AccountChooserInfoBar", RegisterAccountChooserInfoBar}, 164 {"AccountChooserInfoBar", RegisterAccountChooserInfoBar},
163 {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register}, 165 {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register},
164 {"AnswersImageBridge", RegisterAnswersImageBridge}, 166 {"AnswersImageBridge", RegisterAnswersImageBridge},
165 {"AppBannerInfoBarAndroid", RegisterAppBannerInfoBarAndroid}, 167 {"AppBannerInfoBarAndroid", RegisterAppBannerInfoBarAndroid},
166 {"AppBannerInfoBarDelegateAndroid", 168 {"AppBannerInfoBarDelegateAndroid",
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 }; 316 };
315 317
316 bool RegisterBrowserJNI(JNIEnv* env) { 318 bool RegisterBrowserJNI(JNIEnv* env) {
317 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 319 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
318 return RegisterNativeMethods(env, kChromeRegisteredMethods, 320 return RegisterNativeMethods(env, kChromeRegisteredMethods,
319 arraysize(kChromeRegisteredMethods)); 321 arraysize(kChromeRegisteredMethods));
320 } 322 }
321 323
322 } // namespace android 324 } // namespace android
323 } // namespace chrome 325 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698