chrome/browser/android/chrome_jni_registrar.cc - Issue 11186010: Update geolocation infobar to handle Android system settings

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: Failed to upload Created 8 years, 1 month 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/android/java/src/org/chromium/chrome/browser/GoogleLocationSettingsHelperStub.java ('k') | chrome/browser/android/google_location_settings_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/navigation_interception/component_jni_registr ar.h"	16 #include "chrome/browser/component/navigation_interception/component_jni_registr ar.h"

15 #include "chrome/browser/component/web_contents_delegate_android/component_jni_r egistrar.h"	17 #include "chrome/browser/component/web_contents_delegate_android/component_jni_r egistrar.h"

16 #include "chrome/browser/history/android/sqlite_cursor.h"	18 #include "chrome/browser/history/android/sqlite_cursor.h"

17 #include "chrome/browser/ui/android/autofill/autofill_external_delegate.h"	19 #include "chrome/browser/ui/android/autofill/autofill_external_delegate.h"

18 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"	20 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"

19	21

20 namespace chrome {	22 namespace chrome {

21 namespace android {	23 namespace android {

22	24

23 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {	25 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

24 { "AutofillExternalDelegate",	26 { "AutofillExternalDelegate",

25 AutofillExternalDelegateAndroid::RegisterAutofillExternalDelegate},	27 AutofillExternalDelegateAndroid::RegisterAutofillExternalDelegate},

26 { "ChromeBrowserProvider",	28 { "ChromeBrowserProvider",

27 ChromeBrowserProvider::RegisterChromeBrowserProvider },	29 ChromeBrowserProvider::RegisterChromeBrowserProvider },

28 { "ChromeWebContentsDelegateAndroid",	30 { "ChromeWebContentsDelegateAndroid",

29 RegisterChromeWebContentsDelegateAndroid },	31 RegisterChromeWebContentsDelegateAndroid },

30 { "ContentViewUtil", RegisterContentViewUtil },	32 { "ContentViewUtil", RegisterContentViewUtil },

	33 { "GoogleLocationSettingsHelper",

	34 GoogleLocationSettingsHelper::Register },

	35 { "GoogleLocationSettingsHelperFactory",

	36 GoogleLocationSettingsHelperFactory::Register },

31 { "IntentHelper", RegisterIntentHelper },	37 { "IntentHelper", RegisterIntentHelper },

32 { "JavascriptAppModalDialog",	38 { "JavascriptAppModalDialog",

33 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },	39 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },

34 { "ProcessUtils", RegisterProcessUtils },	40 { "ProcessUtils", RegisterProcessUtils },

35 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },	41 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },

36 { "navigation_interception", navigation_interception::RegisterJni },	42 { "navigation_interception", navigation_interception::RegisterJni },

37 };	43 };

38	44

39 bool RegisterJni(JNIEnv* env) {	45 bool RegisterJni(JNIEnv* env) {

40 web_contents_delegate_android::RegisterJni(env);	46 web_contents_delegate_android::RegisterJni(env);

41 return RegisterNativeMethods(env, kChromeRegisteredMethods,	47 return RegisterNativeMethods(env, kChromeRegisteredMethods,

42 arraysize(kChromeRegisteredMethods));	48 arraysize(kChromeRegisteredMethods));

43 }	49 }

44	50

45 } // namespace android	51 } // namespace android

46 } // namespace chrome	52 } // namespace chrome

OLD	NEW