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

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

Issue 10823340: [Android] Upstream Modal Dialogs functionality (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/content_view_util.h" 9 #include "chrome/browser/android/content_view_util.h"
10 #include "chrome/browser/android/intent_helper.h" 10 #include "chrome/browser/android/intent_helper.h"
11 #include "chrome/browser/android/process_utils.h" 11 #include "chrome/browser/android/process_utils.h"
12 #include "chrome/browser/component/web_contents_delegate_android/component_jni_r egistrar.h" 12 #include "chrome/browser/component/web_contents_delegate_android/component_jni_r egistrar.h"
13 #include "chrome/browser/history/android/sqlite_cursor.h" 13 #include "chrome/browser/history/android/sqlite_cursor.h"
14 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
14 15
15 namespace chrome { 16 namespace chrome {
16 namespace android { 17 namespace android {
17 18
18 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 19 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
19 { "ContentViewUtil", RegisterContentViewUtil }, 20 { "ContentViewUtil", RegisterContentViewUtil },
20 { "IntentHelper", RegisterIntentHelper }, 21 { "IntentHelper", RegisterIntentHelper },
22 { "JavascriptAppModalDialog",
23 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
21 { "ProcessUtils", RegisterProcessUtils }, 24 { "ProcessUtils", RegisterProcessUtils },
22 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, 25 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
23 }; 26 };
24 27
25 bool RegisterJni(JNIEnv* env) { 28 bool RegisterJni(JNIEnv* env) {
26 web_contents_delegate_android::RegisterJni(env); 29 web_contents_delegate_android::RegisterJni(env);
27 return RegisterNativeMethods(env, kChromeRegisteredMethods, 30 return RegisterNativeMethods(env, kChromeRegisteredMethods,
28 arraysize(kChromeRegisteredMethods)); 31 arraysize(kChromeRegisteredMethods));
29 } 32 }
30 33
31 } // namespace android 34 } // namespace android
32 } // namespace chrome 35 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698