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

Side by Side Diff: chrome/browser/geolocation/chrome_geolocation_permission_context_android.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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/geolocation/chrome_geolocation_permission_context_andro id.h" 5 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_andro id.h"
6 6
7 #include "base/prefs/pref_service.h"
7 #include "chrome/browser/android/google_location_settings_helper.h" 8 #include "chrome/browser/android/google_location_settings_helper.h"
8 #include "chrome/browser/prefs/pref_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
12 12
13 ChromeGeolocationPermissionContextAndroid:: 13 ChromeGeolocationPermissionContextAndroid::
14 ChromeGeolocationPermissionContextAndroid(Profile* profile) 14 ChromeGeolocationPermissionContextAndroid(Profile* profile)
15 : ChromeGeolocationPermissionContext(profile), 15 : ChromeGeolocationPermissionContext(profile),
16 google_location_settings_helper_( 16 google_location_settings_helper_(
17 GoogleLocationSettingsHelper::Create()) { 17 GoogleLocationSettingsHelper::Create()) {
18 } 18 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 if (allowed && 53 if (allowed &&
54 !google_location_settings_helper_->IsGoogleAppsLocationSettingEnabled()) { 54 !google_location_settings_helper_->IsGoogleAppsLocationSettingEnabled()) {
55 QueueController()->CreateInfoBarRequest(id, requesting_frame, embedder, 55 QueueController()->CreateInfoBarRequest(id, requesting_frame, embedder,
56 callback); 56 callback);
57 return; 57 return;
58 } 58 }
59 59
60 ChromeGeolocationPermissionContext::PermissionDecided( 60 ChromeGeolocationPermissionContext::PermissionDecided(
61 id, requesting_frame, embedder, callback, allowed); 61 id, requesting_frame, embedder, callback, allowed);
62 } 62 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698