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

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

Issue 22031003: Rename BrowserThread::IsWellKnownThread to IsThreadInitialized. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Minor comment reword. Created 7 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
OLDNEW
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_android.h" 5 #include "chrome/browser/search_engines/search_terms_data_android.h"
6 6
7 #include "chrome/browser/search_engines/search_terms_data.h" 7 #include "chrome/browser/search_engines/search_terms_data.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 9
10 base::LazyInstance<string16>::Leaky 10 base::LazyInstance<string16>::Leaky
11 SearchTermsDataAndroid::rlz_parameter_value_ = LAZY_INSTANCE_INITIALIZER; 11 SearchTermsDataAndroid::rlz_parameter_value_ = LAZY_INSTANCE_INITIALIZER;
12 base::LazyInstance<std::string>::Leaky 12 base::LazyInstance<std::string>::Leaky
13 SearchTermsDataAndroid::search_client_ = LAZY_INSTANCE_INITIALIZER; 13 SearchTermsDataAndroid::search_client_ = LAZY_INSTANCE_INITIALIZER;
14 14
15 string16 UIThreadSearchTermsData::GetRlzParameterValue() const { 15 string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
16 DCHECK( 16 DCHECK(!content::BrowserThread::IsThreadInitialized(
17 !content::BrowserThread::IsWellKnownThread(content::BrowserThread::UI) || 17 content::BrowserThread::UI) ||
18 content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 18 content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
19 // Android doesn't use the rlz library. Instead, it manages the rlz string 19 // Android doesn't use the rlz library. Instead, it manages the rlz string
20 // on its own. 20 // on its own.
21 return SearchTermsDataAndroid::rlz_parameter_value_.Get(); 21 return SearchTermsDataAndroid::rlz_parameter_value_.Get();
22 } 22 }
23 23
24 std::string UIThreadSearchTermsData::GetSearchClient() const { 24 std::string UIThreadSearchTermsData::GetSearchClient() const {
25 DCHECK( 25 DCHECK(!content::BrowserThread::IsThreadInitialized(
26 !content::BrowserThread::IsWellKnownThread(content::BrowserThread::UI) || 26 content::BrowserThread::UI) ||
27 content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 27 content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
28 return SearchTermsDataAndroid::search_client_.Get(); 28 return SearchTermsDataAndroid::search_client_.Get();
29 } 29 }
OLDNEW
« no previous file with comments | « chrome/browser/search_engines/search_terms_data.cc ('k') | chrome/browser/search_engines/template_url_prepopulate_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698