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

Side by Side Diff: chrome/browser/search_engines/ui_thread_search_terms_data.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/search_engines/ui_thread_search_terms_data.h" 5 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/prefs/pref_service.h"
11 #include "build/build_config.h" 10 #include "build/build_config.h"
12 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/google/google_brand.h" 12 #include "chrome/browser/google/google_brand.h"
14 #include "chrome/browser/google/google_url_tracker_factory.h" 13 #include "chrome/browser/google/google_url_tracker_factory.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/search/instant_service.h" 15 #include "chrome/browser/search/instant_service.h"
17 #include "chrome/browser/search/instant_service_factory.h" 16 #include "chrome/browser/search/instant_service_factory.h"
18 #include "chrome/browser/search/search.h" 17 #include "chrome/browser/search/search.h"
19 #include "chrome/common/channel_info.h" 18 #include "chrome/common/channel_info.h"
20 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
22 #include "components/google/core/browser/google_url_tracker.h" 21 #include "components/google/core/browser/google_url_tracker.h"
23 #include "components/google/core/browser/google_util.h" 22 #include "components/google/core/browser/google_util.h"
24 #include "components/omnibox/browser/omnibox_field_trial.h" 23 #include "components/omnibox/browser/omnibox_field_trial.h"
24 #include "components/prefs/pref_service.h"
25 #include "components/search/search.h" 25 #include "components/search/search.h"
26 #include "components/version_info/version_info.h" 26 #include "components/version_info/version_info.h"
27 #include "content/public/browser/browser_thread.h" 27 #include "content/public/browser/browser_thread.h"
28 #include "ui/base/device_form_factor.h" 28 #include "ui/base/device_form_factor.h"
29 #include "url/gurl.h" 29 #include "url/gurl.h"
30 30
31 #if defined(ENABLE_RLZ) 31 #if defined(ENABLE_RLZ)
32 #include "components/rlz/rlz_tracker.h" 32 #include "components/rlz/rlz_tracker.h"
33 #endif 33 #endif
34 34
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 std::string UIThreadSearchTermsData::GetAcceptLanguages() const { 153 std::string UIThreadSearchTermsData::GetAcceptLanguages() const {
154 return profile_ ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) 154 return profile_ ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)
155 : std::string(); 155 : std::string();
156 } 156 }
157 157
158 // static 158 // static
159 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) { 159 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
160 delete google_base_url_; 160 delete google_base_url_;
161 google_base_url_ = base_url.empty() ? NULL : new std::string(base_url); 161 google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
162 } 162 }
OLDNEW
« no previous file with comments | « chrome/browser/search_engines/template_url_service_factory.cc ('k') | chrome/browser/services/gcm/fake_signin_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698