| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ios/chrome/browser/search_engines/ui_thread_search_terms_data.h" | 5 #include "ios/chrome/browser/search_engines/ui_thread_search_terms_data.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
| 9 #include "components/google/core/browser/google_url_tracker.h" | 9 #include "components/google/core/browser/google_url_tracker.h" |
| 10 #include "components/google/core/browser/google_util.h" | 10 #include "components/google/core/browser/google_util.h" |
| 11 #include "components/omnibox/browser/omnibox_field_trial.h" | 11 #include "components/omnibox/browser/omnibox_field_trial.h" |
| 12 #include "components/search/search.h" | 12 #include "components/search/search.h" |
| 13 #include "components/version_info/version_info.h" | 13 #include "components/version_info/version_info.h" |
| 14 #include "ios/chrome/browser/application_context.h" | 14 #include "ios/chrome/browser/application_context.h" |
| 15 #include "ios/chrome/browser/experimental_flags.h" | 15 #include "ios/chrome/browser/experimental_flags.h" |
| 16 #include "ios/chrome/browser/google/google_brand.h" | 16 #include "ios/chrome/browser/google/google_brand.h" |
| 17 #include "ios/chrome/browser/google/google_url_tracker_factory.h" | 17 #include "ios/chrome/browser/google/google_url_tracker_factory.h" |
| 18 #include "ios/chrome/common/channel_info.h" | 18 #include "ios/chrome/common/channel_info.h" |
| 19 #include "ios/web/public/web_thread.h" | 19 #include "ios/web/public/web_thread.h" |
| 20 #include "net/base/escape.h" | 20 #include "net/base/escape.h" |
| 21 #include "url/gurl.h" | 21 #include "url/gurl.h" |
| 22 | 22 |
| 23 #if defined(ENABLE_RLZ) | 23 #if defined(ENABLE_RLZ) |
| 24 #include "components/rlz/rlz_tracker.h" | 24 #include "components/rlz/rlz_tracker.h" // nogncheck |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 namespace ios { | 27 namespace ios { |
| 28 | 28 |
| 29 UIThreadSearchTermsData::UIThreadSearchTermsData( | 29 UIThreadSearchTermsData::UIThreadSearchTermsData( |
| 30 ios::ChromeBrowserState* browser_state) | 30 ios::ChromeBrowserState* browser_state) |
| 31 : browser_state_(browser_state) { | 31 : browser_state_(browser_state) { |
| 32 DCHECK(!web::WebThread::IsThreadInitialized(web::WebThread::UI) || | 32 DCHECK(!web::WebThread::IsThreadInitialized(web::WebThread::UI) || |
| 33 web::WebThread::CurrentlyOn(web::WebThread::UI)); | 33 web::WebThread::CurrentlyOn(web::WebThread::UI)); |
| 34 } | 34 } |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 if (version_info::IsOfficialBuild()) | 110 if (version_info::IsOfficialBuild()) |
| 111 version += " (Official)"; | 111 version += " (Official)"; |
| 112 version += " " + version_info::GetOSType(); | 112 version += " " + version_info::GetOSType(); |
| 113 std::string modifier(GetChannelString()); | 113 std::string modifier(GetChannelString()); |
| 114 if (!modifier.empty()) | 114 if (!modifier.empty()) |
| 115 version += " " + modifier; | 115 version += " " + modifier; |
| 116 return version; | 116 return version; |
| 117 } | 117 } |
| 118 | 118 |
| 119 } // namespace ios | 119 } // namespace ios |
| OLD | NEW |