ash/common/wm_shell.cc - Issue 2625843002: 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/wm_shell.cc

Issue 2625843002: Folds WmRootWindowController into RootWindowController (Closed)

Patch Set: 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/wm_shell.cc

diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc

index f86da79a99ec144c7bcf2f7312743accfaf33c36..40155129d13f97576d0bec8745c7ba4119b13ea4 100644

--- a/ash/common/wm_shell.cc

+++ b/ash/common/wm_shell.cc

@@ -46,9 +46,9 @@

#include "ash/common/wm/root_window_finder.h"

#include "ash/common/wm/system_modal_container_layout_manager.h"

#include "ash/common/wm/window_cycle_controller.h"

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

#include "ash/common/wm_window.h"

#include "ash/public/cpp/shell_window_ids.h"

+#include "ash/root_window_controller.h"

#include "base/bind.h"

#include "base/logging.h"

#include "base/memory/ptr_util.h"

@@ -286,7 +286,7 @@ WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)

WmShell::~WmShell() {}

-WmRootWindowController* WmShell::GetPrimaryRootWindowController() {

+RootWindowController* WmShell::GetPrimaryRootWindowController() {

return GetPrimaryRootWindow()->GetRootWindowController();

}