ash/launcher/launcher_button.cc - Issue 15174004: Merge 198585 "Regression issue with "ShouldHop", the UpdateState..."

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: ash/launcher/launcher_button.cc

Issue 15174004: Merge 198585 "Regression issue with "ShouldHop", the UpdateState..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/

Patch Set: Created 7 years, 7 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

Index: ash/launcher/launcher_button.cc

===================================================================

--- ash/launcher/launcher_button.cc (revision 200062)

+++ ash/launcher/launcher_button.cc (working copy)

@@ -300,7 +300,7 @@

base::TimeDelta::FromMilliseconds(kHopUpMS));

}

state_ |= state;

- UpdateState();

+ Layout();

if (state & STATE_ATTENTION)

bar_->ShowAttention(true);

}

@@ -316,7 +316,7 @@

base::TimeDelta::FromMilliseconds(kHopDownMS));

}

state_ &= ~state;

- UpdateState();

+ Layout();

if (state & STATE_ATTENTION)

bar_->ShowAttention(false);

}

« no previous file with comments | « no previous file | ash/launcher/launcher_view_unittest.cc » ('j') | no next file with comments »