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

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

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/thread_restrictions.h" 8 #include "base/threading/thread_restrictions.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/browser_thread.h" 10 #include "chrome/browser/browser_thread.h"
11 #include "chrome/browser/google/google_url_tracker.h" 11 #include "chrome/browser/google/google_url_tracker.h"
12 #include "googleurl/src/gurl.h" 12 #include "googleurl/src/gurl.h"
13 13
14 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD) 14 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
15 #include "chrome/browser/rlz/rlz.h" 15 #include "chrome/browser/rlz/rlz.h"
16 #include "chrome/installer/util/google_update_settings.h" 16 #include "chrome/installer/util/google_update_settings.h"
17 #endif 17 #endif
18 18
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string); 87 RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string);
88 return rlz_string; 88 return rlz_string;
89 } 89 }
90 #endif 90 #endif
91 91
92 // static 92 // static
93 void UIThreadSearchTermsData::SetGoogleBaseURL(std::string* google_base_url) { 93 void UIThreadSearchTermsData::SetGoogleBaseURL(std::string* google_base_url) {
94 delete google_base_url_; 94 delete google_base_url_;
95 google_base_url_ = google_base_url; 95 google_base_url_ = google_base_url;
96 } 96 }
OLDNEW
« no previous file with comments | « chrome/browser/rlz/rlz.cc ('k') | chrome/browser/search_engines/template_url_model_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698