ui/aura_shell/workspace/workspace_manager.cc - Issue 8399044: aura: Make sure the desktop widget gets parented to the correct container.

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: ui/aura_shell/workspace/workspace_manager.cc

Issue 8399044: aura: Make sure the desktop widget gets parented to the correct container. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 9 years, 2 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: ui/aura_shell/workspace/workspace_manager.cc

diff --git a/ui/aura_shell/workspace/workspace_manager.cc b/ui/aura_shell/workspace/workspace_manager.cc

index f7a463f3ba43a06ae6708798dc7a2e1e7c956fae..14fda7923ec6315056a5b91559f99564d356d13a 100644

--- a/ui/aura_shell/workspace/workspace_manager.cc

+++ b/ui/aura_shell/workspace/workspace_manager.cc

@@ -120,7 +120,7 @@ void WorkspaceManager::SetOverview(bool overview) {

transform.SetTranslateX(dx);

transform.SetTranslateY(workspace_size_.height() * (1.0f - scale) / 2);

- } else {

+ } else if (active_workspace_) {

transform.SetTranslateX(-active_workspace_->bounds().x());

}

« no previous file with comments | « ui/aura_shell/examples/lock_view.cc ('k') | no next file » | no next file with comments »