chrome/browser/google/google_util_chromeos.cc - Issue 22031003: Rename BrowserThread::IsWellKnownThread to IsThreadInitialized.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/google/google_util_chromeos.cc

Issue 22031003: Rename BrowserThread::IsWellKnownThread to IsThreadInitialized. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix build on Windows, Android and ChromeOS. 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_store.cc ('k') | chrome/browser/history/scored_history_match.cc » ('j') | content/browser/browser_thread_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/google/google_util_chromeos.cc

diff --git a/chrome/browser/google/google_util_chromeos.cc b/chrome/browser/google/google_util_chromeos.cc

index b39d910ef396008739fe2cb7feda743b551a10b6..06232e4df629a00a1b6f7bf03026305fe2f039d3 100644

--- a/chrome/browser/google/google_util_chromeos.cc

+++ b/chrome/browser/google/google_util_chromeos.cc

@@ -46,16 +46,16 @@ bool g_brand_empty = false;

} // namespace

void ClearBrandForCurrentSession() {

- DCHECK(

- !content::BrowserThread::IsWellKnownThread(content::BrowserThread::UI) ||

- content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

+ DCHECK(!content::BrowserThread::IsThreadInitialized(

+ content::BrowserThread::UI) ||

+ content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

g_brand_empty = true;

}

std::string GetBrand() {

- DCHECK(

- !content::BrowserThread::IsWellKnownThread(content::BrowserThread::UI) ||

- content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

+ DCHECK(!content::BrowserThread::IsThreadInitialized(

+ content::BrowserThread::UI) ||

+ content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

if (g_brand_empty)

return std::string();

DCHECK(g_browser_process->local_state());