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

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

Issue 10912172: [Android] Upstream ChromeBrowserProvider, the Android port ContentProvider implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: temporarily removing tests until we can compile and run them (soon) Created 8 years, 3 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
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 "chrome/browser/android/chrome_web_contents_delegate_android.h" 9 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
10 #include "chrome/browser/android/content_view_util.h" 10 #include "chrome/browser/android/content_view_util.h"
11 #include "chrome/browser/android/intent_helper.h" 11 #include "chrome/browser/android/intent_helper.h"
12 #include "chrome/browser/android/process_utils.h" 12 #include "chrome/browser/android/process_utils.h"
13 #include "chrome/browser/android/provider/chrome_browser_provider.h"
13 #include "chrome/browser/component/web_contents_delegate_android/component_jni_r egistrar.h" 14 #include "chrome/browser/component/web_contents_delegate_android/component_jni_r egistrar.h"
14 #include "chrome/browser/history/android/sqlite_cursor.h" 15 #include "chrome/browser/history/android/sqlite_cursor.h"
15 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 16 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
16 17
17 namespace chrome { 18 namespace chrome {
18 namespace android { 19 namespace android {
19 20
20 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 21 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
22 { "ChromeBrowserProvider",
23 ChromeBrowserProvider::RegisterChromeBrowserProvider },
21 { "ChromeWebContentsDelegateAndroid", 24 { "ChromeWebContentsDelegateAndroid",
22 RegisterChromeWebContentsDelegateAndroid }, 25 RegisterChromeWebContentsDelegateAndroid },
23 { "ContentViewUtil", RegisterContentViewUtil }, 26 { "ContentViewUtil", RegisterContentViewUtil },
24 { "IntentHelper", RegisterIntentHelper }, 27 { "IntentHelper", RegisterIntentHelper },
25 { "JavascriptAppModalDialog", 28 { "JavascriptAppModalDialog",
26 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, 29 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
27 { "ProcessUtils", RegisterProcessUtils }, 30 { "ProcessUtils", RegisterProcessUtils },
28 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, 31 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
29 }; 32 };
30 33
31 bool RegisterJni(JNIEnv* env) { 34 bool RegisterJni(JNIEnv* env) {
32 web_contents_delegate_android::RegisterJni(env); 35 web_contents_delegate_android::RegisterJni(env);
33 return RegisterNativeMethods(env, kChromeRegisteredMethods, 36 return RegisterNativeMethods(env, kChromeRegisteredMethods,
34 arraysize(kChromeRegisteredMethods)); 37 arraysize(kChromeRegisteredMethods));
35 } 38 }
36 39
37 } // namespace android 40 } // namespace android
38 } // namespace chrome 41 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698