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

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

Issue 447183003: Move OmniboxFieldTrial to components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & fix switch indent Created 6 years, 4 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 | Annotate | Revision Log
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" 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/omnibox/omnibox_field_trial.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/browser/sync/glue/device_info.h" 18 #include "chrome/browser/sync/glue/device_info.h"
20 #include "chrome/browser/themes/theme_service.h" 19 #include "chrome/browser/themes/theme_service.h"
21 #include "chrome/browser/themes/theme_service_factory.h" 20 #include "chrome/browser/themes/theme_service_factory.h"
22 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/chrome_version_info.h" 22 #include "chrome/common/chrome_version_info.h"
24 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
25 #include "components/google/core/browser/google_util.h" 24 #include "components/google/core/browser/google_util.h"
25 #include "components/omnibox/omnibox_field_trial.h"
26 #include "components/search/search.h" 26 #include "components/search/search.h"
27 #include "content/public/browser/browser_thread.h" 27 #include "content/public/browser/browser_thread.h"
28 #include "sync/protocol/sync.pb.h" 28 #include "sync/protocol/sync.pb.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 "chrome/browser/rlz/rlz.h" 32 #include "chrome/browser/rlz/rlz.h"
33 #endif 33 #endif
34 34
35 using content::BrowserThread; 35 using content::BrowserThread;
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 return version; 194 return version;
195 } 195 }
196 return "unknown"; 196 return "unknown";
197 } 197 }
198 198
199 // static 199 // static
200 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) { 200 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
201 delete google_base_url_; 201 delete google_base_url_;
202 google_base_url_ = base_url.empty() ? NULL : new std::string(base_url); 202 google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
203 } 203 }
OLDNEW
« no previous file with comments | « chrome/browser/omnibox/omnibox_field_trial_unittest.cc ('k') | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698