ash/common/shelf/shelf_widget.cc - Issue 2620153003: Folds WmRootWindowController into RootWindowController

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/shelf/shelf_widget.cc

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)

Patch Set: merge Created 3 years, 11 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/shelf/shelf_widget.cc

diff --git a/ash/common/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc

index 4ebc52eec6e2f401e9dc2457ebc6ad257f9642a1..e80b8bf997f3d9c59a9f5e7e0ff9dd532c621755 100644

--- a/ash/common/shelf/shelf_widget.cc

+++ b/ash/common/shelf/shelf_widget.cc

@@ -18,10 +18,10 @@

#include "ash/common/system/status_area_layout_manager.h"

#include "ash/common/system/status_area_widget.h"

#include "ash/common/wm_lookup.h"

-#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

#include "ash/common/wm_window_property.h"

+#include "ash/root_window_controller.h"

#include "base/memory/ptr_util.h"

#include "grit/ash_resources.h"

#include "ui/base/resource/resource_bundle.h"