chrome/browser/android/chrome_jni_registrar.cc - Issue 815343005: Clean up geolocation code now that it's all upstream.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 815343005: Clean up geolocation code now that it's all upstream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: renamed IsSystemLocationEnabled -> IsLocationEnabled Created 5 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/app_google_location_settings_helper.cc ('k') | chrome/browser/android/google_location_settings_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 5cfae150d072b849349e07f0677a43f9359d1ea7..c38a4e8e476e1893eb0927cf511233f3f7f33123 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -9,7 +9,6 @@

#include "base/debug/trace_event.h"

#include "chrome/browser/android/accessibility/font_size_prefs_android.h"

#include "chrome/browser/android/accessibility_util.h"

-#include "chrome/browser/android/app_google_location_settings_helper.h"

#include "chrome/browser/android/appmenu/app_menu_drag_helper.h"

#include "chrome/browser/android/banners/app_banner_manager.h"

#include "chrome/browser/android/bookmarks/bookmarks_bridge.h"

@@ -30,6 +29,7 @@

#include "chrome/browser/android/find_in_page/find_in_page_bridge.h"

#include "chrome/browser/android/foreign_session_helper.h"

#include "chrome/browser/android/intent_helper.h"

+#include "chrome/browser/android/location_settings_impl.h"

#include "chrome/browser/android/logo_bridge.h"

#include "chrome/browser/android/most_visited_sites.h"

#include "chrome/browser/android/new_tab_page_prefs.h"

@@ -181,7 +181,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{"JavascriptAppModalDialog",

JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog},

{"LayerTitleCache", chrome::android::RegisterLayerTitleCache},

- {"LocationSettings", AppGoogleLocationSettingsHelper::Register},

+ {"LocationSettings", LocationSettingsImpl::Register},

{"LogoBridge", RegisterLogoBridge},

{"MostVisitedSites", MostVisitedSites::Register},

{"NativeInfoBar", RegisterNativeInfoBar},