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

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

Issue 17392006: In components/autofill, move browser/ to core/browser/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to fix conflicts Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/autofill/android/personal_data_manager_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/chrome_web_contents_delegate_android.h" 10 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/speech/tts_android.h" 21 #include "chrome/browser/speech/tts_android.h"
22 #include "chrome/browser/sync/profile_sync_service_android.h" 22 #include "chrome/browser/sync/profile_sync_service_android.h"
23 #include "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h" 23 #include "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h"
24 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 24 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
25 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 25 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
26 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 26 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
27 #include "chrome/browser/ui/android/navigation_popup.h" 27 #include "chrome/browser/ui/android/navigation_popup.h"
28 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 28 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
29 #include "chrome/browser/ui/android/validation_message_bubble_android.h" 29 #include "chrome/browser/ui/android/validation_message_bubble_android.h"
30 #include "chrome/browser/ui/android/website_settings_popup_android.h" 30 #include "chrome/browser/ui/android/website_settings_popup_android.h"
31 #include "components/autofill/browser/android/component_jni_registrar.h" 31 #include "components/autofill/core/browser/android/component_jni_registrar.h"
32 #include "components/navigation_interception/component_jni_registrar.h" 32 #include "components/navigation_interception/component_jni_registrar.h"
33 #include "components/web_contents_delegate_android/component_jni_registrar.h" 33 #include "components/web_contents_delegate_android/component_jni_registrar.h"
34 34
35 bool RegisterCertificateViewer(JNIEnv* env); 35 bool RegisterCertificateViewer(JNIEnv* env);
36 36
37 namespace chrome { 37 namespace chrome {
38 namespace android { 38 namespace android {
39 39
40 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 40 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
41 // Register JNI for components we depend on. 41 // Register JNI for components we depend on.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 }; 79 };
80 80
81 bool RegisterJni(JNIEnv* env) { 81 bool RegisterJni(JNIEnv* env) {
82 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 82 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
83 return RegisterNativeMethods(env, kChromeRegisteredMethods, 83 return RegisterNativeMethods(env, kChromeRegisteredMethods,
84 arraysize(kChromeRegisteredMethods)); 84 arraysize(kChromeRegisteredMethods));
85 } 85 }
86 86
87 } // namespace android 87 } // namespace android
88 } // namespace chrome 88 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/autofill/android/personal_data_manager_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698