ash/common/wm/dock/docked_window_layout_manager.cc - Issue 2738133003: Promotes a handful of members from WmShell to Shell

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/common/wm/dock/docked_window_layout_manager.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)

Patch Set: merge Created 3 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:

Index: ash/common/wm/dock/docked_window_layout_manager.cc

diff --git a/ash/common/wm/dock/docked_window_layout_manager.cc b/ash/common/wm/dock/docked_window_layout_manager.cc

index ef6478be372ffa61a4481fd2119ccc5e0867e35c..c8920b409a1eb1d99724bf0409c3bf4dcc51fa3c 100644

--- a/ash/common/wm/dock/docked_window_layout_manager.cc

+++ b/ash/common/wm/dock/docked_window_layout_manager.cc

@@ -59,7 +59,7 @@ class DockedBackgroundWidget : public views::Widget,

alignment_(DOCKED_ALIGNMENT_NONE),

background_animator_(SHELF_BACKGROUND_DEFAULT,

nullptr,

- WmShell::Get()->wallpaper_controller()),

+ Shell::GetInstance()->wallpaper_controller()),

opaque_background_(ui::LAYER_SOLID_COLOR),

visible_background_type_(manager_->shelf()->GetBackgroundType()),

visible_background_change_type_(AnimationChangeType::IMMEDIATE) {

« no previous file with comments | « ash/common/wallpaper/wallpaper_view.cc ('k') | ash/common/wm/overview/window_selector.cc » ('j') | no next file with comments »