| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/search_engines/search_terms_data.h" | 5 #include "chrome/browser/search_engines/search_terms_data.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/metrics/field_trial.h" | 8 #include "base/metrics/field_trial.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/google/google_url_tracker.h" | 11 #include "chrome/browser/google/google_url_tracker.h" |
| 12 #include "chrome/browser/google/google_util.h" | 12 #include "chrome/browser/google/google_util.h" |
| 13 #include "chrome/browser/instant/search.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/ui/search/search.h" | |
| 15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
| 16 #include "googleurl/src/gurl.h" | 16 #include "googleurl/src/gurl.h" |
| 17 | 17 |
| 18 #if defined(ENABLE_RLZ) | 18 #if defined(ENABLE_RLZ) |
| 19 #include "chrome/browser/rlz/rlz.h" | 19 #include "chrome/browser/rlz/rlz.h" |
| 20 #endif | 20 #endif |
| 21 | 21 |
| 22 using content::BrowserThread; | 22 using content::BrowserThread; |
| 23 | 23 |
| 24 SearchTermsData::SearchTermsData() { | 24 SearchTermsData::SearchTermsData() { |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 base::Uint64ToString(instant_extended_api_version) + "&"; | 145 base::Uint64ToString(instant_extended_api_version) + "&"; |
| 146 } | 146 } |
| 147 return std::string(); | 147 return std::string(); |
| 148 } | 148 } |
| 149 | 149 |
| 150 // static | 150 // static |
| 151 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) { | 151 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) { |
| 152 delete google_base_url_; | 152 delete google_base_url_; |
| 153 google_base_url_ = base_url.empty() ? NULL : new std::string(base_url); | 153 google_base_url_ = base_url.empty() ? NULL : new std::string(base_url); |
| 154 } | 154 } |
| OLD | NEW |