ash/desktop_background/desktop_background_widget_controller.h - Issue 10982035: Reland - cros: Add CHECK for screen unlock problem

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/desktop_background/desktop_background_widget_controller.h

Issue 10982035: Reland - cros: Add CHECK for screen unlock problem (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: check only ~ScreenLocker Created 8 years, 3 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:

Index: ash/desktop_background/desktop_background_widget_controller.h

diff --git a/ash/desktop_background/desktop_background_widget_controller.h b/ash/desktop_background/desktop_background_widget_controller.h

index d5653328bf04206e1cbdb671c9796603b5f5bf16..7017eb07afcf6811c69de77654025627a4933612 100644

--- a/ash/desktop_background/desktop_background_widget_controller.h

+++ b/ash/desktop_background/desktop_background_widget_controller.h

@@ -37,8 +37,8 @@ class DesktopBackgroundWidgetController : public views::WidgetObserver {

// Move component from |src_container| in |root_window| to |dest_container|.

// It is required for lock screen, when we need to move background so that

- // it hides user's windows.

- void Reparent(aura::RootWindow* root_window,

+ // it hides user's windows. Returns true if there was something to reparent.

+ bool Reparent(aura::RootWindow* root_window,

int src_container,

int dest_container);