chrome/browser/chromeos/login/signin/merge_session_load_page.cc - Issue 1036723003: favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/chromeos/

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/chromeos/login/signin/merge_session_load_page.cc

Issue 1036723003: favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 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/chromeos/login/screens/user_image_screen.cc ('k') | chrome/browser/chromeos/login/signin/merge_session_throttle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/merge_session_load_page.cc

diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

index e0c013e4248f41ca62f2cd38b5786a96e7e06ac2..6d83350d76a3ce3f7aa44602b07ba5e705565764 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

+++ b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

@@ -64,7 +64,7 @@ MergeSessionLoadPage::MergeSessionLoadPage(

}

MergeSessionLoadPage::~MergeSessionLoadPage() {

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

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

}

void MergeSessionLoadPage::Show() {

@@ -106,13 +106,13 @@ void MergeSessionLoadPage::OverrideRendererPrefs(

}

void MergeSessionLoadPage::OnProceed() {

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

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

proceeded_ = true;

NotifyBlockingPageComplete();

}

void MergeSessionLoadPage::OnDontProceed() {

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

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

// Ignore if it's already proceeded.

if (proceeded_)

return;

@@ -157,7 +157,7 @@ OAuth2LoginManager* MergeSessionLoadPage::GetOAuth2LoginManager() {

void MergeSessionLoadPage::OnSessionRestoreStateChanged(

Profile* user_profile, OAuth2LoginManager::SessionRestoreState state) {

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

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

OAuth2LoginManager* manager = GetOAuth2LoginManager();

DVLOG(1) << "Merge session should "