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

Side by Side Diff: chrome/browser/android/search_geolocation/search_geolocation_service.h

Issue 2811073003: Revert of Don't use the DSE geolocation setting when chrome doesn't have location. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/android/search_geolocation/search_geolocation_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 #ifndef CHROME_BROWSER_ANDROID_SEARCH_GEOLOCATION_SEARCH_GEOLOCATION_SERVICE_H_ 5 #ifndef CHROME_BROWSER_ANDROID_SEARCH_GEOLOCATION_SEARCH_GEOLOCATION_SERVICE_H_
6 #define CHROME_BROWSER_ANDROID_SEARCH_GEOLOCATION_SEARCH_GEOLOCATION_SERVICE_H_ 6 #define CHROME_BROWSER_ANDROID_SEARCH_GEOLOCATION_SEARCH_GEOLOCATION_SERVICE_H_
7 7
8 #include "base/callback_forward.h" 8 #include "base/callback_forward.h"
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "chrome/browser/android/location_settings.h"
11 #include "components/content_settings/core/common/content_settings.h" 10 #include "components/content_settings/core/common/content_settings.h"
12 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 11 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
13 #include "components/keyed_service/core/keyed_service.h" 12 #include "components/keyed_service/core/keyed_service.h"
14 #include "url/origin.h" 13 #include "url/origin.h"
15 14
16 namespace content{ 15 namespace content{
17 class BrowserContext; 16 class BrowserContext;
18 } 17 }
19 18
20 namespace user_prefs { 19 namespace user_prefs {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // current DSE CCTLD. 139 // current DSE CCTLD.
141 bool IsContentSettingUserSettable(); 140 bool IsContentSettingUserSettable();
142 141
143 // Whether the feature/experiment setup is enabling the consistent search 142 // Whether the feature/experiment setup is enabling the consistent search
144 // geolocation system. 143 // geolocation system.
145 bool UseConsistentSearchGeolocation(); 144 bool UseConsistentSearchGeolocation();
146 145
147 void SetSearchEngineDelegateForTest( 146 void SetSearchEngineDelegateForTest(
148 std::unique_ptr<SearchEngineDelegate> delegate); 147 std::unique_ptr<SearchEngineDelegate> delegate);
149 148
150 void SetLocationSettingsForTest(std::unique_ptr<LocationSettings> settings);
151
152 Profile* profile_; 149 Profile* profile_;
153 PrefService* pref_service_; 150 PrefService* pref_service_;
154 HostContentSettingsMap* host_content_settings_map_; 151 HostContentSettingsMap* host_content_settings_map_;
155 std::unique_ptr<SearchEngineDelegate> delegate_; 152 std::unique_ptr<SearchEngineDelegate> delegate_;
156 std::unique_ptr<LocationSettings> location_settings_;
157 }; 153 };
158 154
159 #endif // CHROME_BROWSER_ANDROID_SEARCH_GEOLOCATION_SEARCH_GEOLOCATION_SERVICE_ H_ 155 #endif // CHROME_BROWSER_ANDROID_SEARCH_GEOLOCATION_SEARCH_GEOLOCATION_SERVICE_ H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/search_geolocation/search_geolocation_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698