| OLD | NEW |
| 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" | 10 #include "base/prefs/pref_service.h" |
| 11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
| 12 #include "chrome/browser/google/google_brand.h" | 12 #include "chrome/browser/google/google_brand.h" |
| 13 #include "chrome/browser/google/google_profile_helper.h" | 13 #include "chrome/browser/google/google_profile_helper.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/search/instant_service.h" | 15 #include "chrome/browser/search/instant_service.h" |
| 16 #include "chrome/browser/search/instant_service_factory.h" | 16 #include "chrome/browser/search/instant_service_factory.h" |
| 17 #include "chrome/browser/search/search.h" | 17 #include "chrome/browser/search/search.h" |
| 18 #include "chrome/browser/themes/theme_service.h" | 18 #include "chrome/browser/themes/theme_service.h" |
| 19 #include "chrome/browser/themes/theme_service_factory.h" | 19 #include "chrome/browser/themes/theme_service_factory.h" |
| 20 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
| 21 #include "chrome/common/chrome_version_info.h" | 21 #include "chrome/common/chrome_version_info.h" |
| 22 #include "chrome/common/pref_names.h" | |
| 23 #include "components/google/core/browser/google_util.h" | 22 #include "components/google/core/browser/google_util.h" |
| 24 #include "components/omnibox/omnibox_field_trial.h" | 23 #include "components/omnibox/omnibox_field_trial.h" |
| 25 #include "components/search/search.h" | 24 #include "components/search/search.h" |
| 26 #include "content/public/browser/browser_thread.h" | 25 #include "content/public/browser/browser_thread.h" |
| 27 #include "ui/base/device_form_factor.h" | 26 #include "ui/base/device_form_factor.h" |
| 28 #include "url/gurl.h" | 27 #include "url/gurl.h" |
| 29 | 28 |
| 30 #if defined(ENABLE_RLZ) | 29 #if defined(ENABLE_RLZ) |
| 31 #include "chrome/browser/rlz/rlz.h" | 30 #include "chrome/browser/rlz/rlz.h" |
| 32 #endif | 31 #endif |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 if (!modifier.empty()) | 185 if (!modifier.empty()) |
| 187 version += " " + modifier; | 186 version += " " + modifier; |
| 188 return version; | 187 return version; |
| 189 } | 188 } |
| 190 | 189 |
| 191 // static | 190 // static |
| 192 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) { | 191 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) { |
| 193 delete google_base_url_; | 192 delete google_base_url_; |
| 194 google_base_url_ = base_url.empty() ? NULL : new std::string(base_url); | 193 google_base_url_ = base_url.empty() ? NULL : new std::string(base_url); |
| 195 } | 194 } |
| OLD | NEW |