ash/common/system/chromeos/session/logout_confirmation_dialog.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/system/chromeos/session/logout_confirmation_dialog.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/system/chromeos/session/logout_confirmation_dialog.cc

diff --git a/ash/common/system/chromeos/session/logout_confirmation_dialog.cc b/ash/common/system/chromeos/session/logout_confirmation_dialog.cc

index bdd5cbe567262180290edfd5388472615b62c532..1bb3fbde92c8599d5dfdd03fd552e4e1dea8a76c 100644

--- a/ash/common/system/chromeos/session/logout_confirmation_dialog.cc

+++ b/ash/common/system/chromeos/session/logout_confirmation_dialog.cc

@@ -6,10 +6,10 @@

#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"

#include "ash/common/system/tray/tray_constants.h"

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

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

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

+#include "ash/root_window_controller.h"

#include "base/location.h"

#include "base/time/tick_clock.h"

#include "grit/ash_strings.h"