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

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

Issue 11186010: Update geolocation infobar to handle Android system settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updates Created 8 years, 2 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/google_location_settings_helper.h"
12 #include "chrome/browser/android/google_location_settings_helper_factory.h"
11 #include "chrome/browser/android/intent_helper.h" 13 #include "chrome/browser/android/intent_helper.h"
12 #include "chrome/browser/android/process_utils.h" 14 #include "chrome/browser/android/process_utils.h"
13 #include "chrome/browser/android/provider/chrome_browser_provider.h" 15 #include "chrome/browser/android/provider/chrome_browser_provider.h"
14 #include "chrome/browser/component/web_contents_delegate_android/component_jni_r egistrar.h" 16 #include "chrome/browser/component/web_contents_delegate_android/component_jni_r egistrar.h"
15 #include "chrome/browser/history/android/sqlite_cursor.h" 17 #include "chrome/browser/history/android/sqlite_cursor.h"
16 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 18 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
17 19
18 namespace chrome { 20 namespace chrome {
19 namespace android { 21 namespace android {
20 22
21 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 23 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
22 { "ChromeBrowserProvider", 24 { "ChromeBrowserProvider",
23 ChromeBrowserProvider::RegisterChromeBrowserProvider }, 25 ChromeBrowserProvider::RegisterChromeBrowserProvider },
24 { "ChromeWebContentsDelegateAndroid", 26 { "ChromeWebContentsDelegateAndroid",
25 RegisterChromeWebContentsDelegateAndroid }, 27 RegisterChromeWebContentsDelegateAndroid },
26 { "ContentViewUtil", RegisterContentViewUtil }, 28 { "ContentViewUtil", RegisterContentViewUtil },
29 { "GoogleLocationSettingsHelper",
30 GoogleLocationSettingsHelper::Register },
31 { "GoogleLocationSettingsHelperFactory",
32 GoogleLocationSettingsHelperFactory::Register },
27 { "IntentHelper", RegisterIntentHelper }, 33 { "IntentHelper", RegisterIntentHelper },
28 { "JavascriptAppModalDialog", 34 { "JavascriptAppModalDialog",
29 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, 35 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
30 { "ProcessUtils", RegisterProcessUtils }, 36 { "ProcessUtils", RegisterProcessUtils },
31 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, 37 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
32 }; 38 };
33 39
34 bool RegisterJni(JNIEnv* env) { 40 bool RegisterJni(JNIEnv* env) {
35 web_contents_delegate_android::RegisterJni(env); 41 web_contents_delegate_android::RegisterJni(env);
36 return RegisterNativeMethods(env, kChromeRegisteredMethods, 42 return RegisterNativeMethods(env, kChromeRegisteredMethods,
37 arraysize(kChromeRegisteredMethods)); 43 arraysize(kChromeRegisteredMethods));
38 } 44 }
39 45
40 } // namespace android 46 } // namespace android
41 } // namespace chrome 47 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698