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: Updates from comments 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

« chrome/android/testshell/testshell_stubs.cc ('K') | « chrome/android/testshell/testshell_stubs.cc ('k') | chrome/browser/android/google_location_settings_helper.h » ('j') | chrome/browser/android/google_location_settings_helper.cc » ('J')
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/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/autofill/autofill_external_delegate.h"	18 #include "chrome/browser/ui/android/autofill/autofill_external_delegate.h"

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

18	20

19 namespace chrome {	21 namespace chrome {

20 namespace android {	22 namespace android {

21	23

22 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {	24 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

23 { "AutofillExternalDelegate",	25 { "AutofillExternalDelegate",

24 AutofillExternalDelegateAndroid::RegisterAutofillExternalDelegate},	26 AutofillExternalDelegateAndroid::RegisterAutofillExternalDelegate},

25 { "ChromeBrowserProvider",	27 { "ChromeBrowserProvider",

26 ChromeBrowserProvider::RegisterChromeBrowserProvider },	28 ChromeBrowserProvider::RegisterChromeBrowserProvider },

27 { "ChromeWebContentsDelegateAndroid",	29 { "ChromeWebContentsDelegateAndroid",

28 RegisterChromeWebContentsDelegateAndroid },	30 RegisterChromeWebContentsDelegateAndroid },

29 { "ContentViewUtil", RegisterContentViewUtil },	31 { "ContentViewUtil", RegisterContentViewUtil },

	32 { "GoogleLocationSettingsHelper",

	33 GoogleLocationSettingsHelper::Register },

	34 { "GoogleLocationSettingsHelperFactory",

	35 GoogleLocationSettingsHelperFactory::Register },

30 { "IntentHelper", RegisterIntentHelper },	36 { "IntentHelper", RegisterIntentHelper },

31 { "JavascriptAppModalDialog",	37 { "JavascriptAppModalDialog",

32 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },	38 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },

33 { "ProcessUtils", RegisterProcessUtils },	39 { "ProcessUtils", RegisterProcessUtils },

34 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor},	40 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor},

35 };	41 };

36	42

37 bool RegisterJni(JNIEnv* env) {	43 bool RegisterJni(JNIEnv* env) {

38 web_contents_delegate_android::RegisterJni(env);	44 web_contents_delegate_android::RegisterJni(env);

39 return RegisterNativeMethods(env, kChromeRegisteredMethods,	45 return RegisterNativeMethods(env, kChromeRegisteredMethods,

40 arraysize(kChromeRegisteredMethods));	46 arraysize(kChromeRegisteredMethods));

41 }	47 }

42	48

43 } // namespace android	49 } // namespace android

44 } // namespace chrome	50 } // namespace chrome

OLD	NEW