ash/common/wm_shell.cc - Issue 2265563002: Shuffles around immersive related classes

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 2265563002: Shuffles around immersive related classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@immersive_pure_virtual

Patch Set: cleanup Created 4 years, 4 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:

View side-by-side diff with in-line comments

Download patch

Index: ash/common/wm_shell.cc

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

index c3fd2edcd8a34672c7ddec33dffa60a56dbe18cb..1195e065ee58cd90096c016617817268a418ce69 100644

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

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

@@ -25,6 +25,7 @@

#include "ash/common/system/toast/toast_manager.h"

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

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

+#include "ash/common/wm/immersive_context_ash.h"

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

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

#include "ash/common/wm/overview/window_selector_controller.h"

@@ -32,6 +33,7 @@

#include "ash/common/wm_window.h"

#include "base/bind.h"

#include "base/logging.h"

+#include "base/memory/ptr_util.h"

#include "ui/app_list/presenter/app_list_presenter.h"

#include "ui/display/display.h"

#include "ui/views/focus/focus_manager_factory.h"

@@ -171,6 +173,7 @@ void WmShell::SetShelfDelegateForTesting(

WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)

: delegate_(std::move(shell_delegate)),

focus_cycler_(new FocusCycler),

+ immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),

shelf_model_(new ShelfModel), // Must create before ShelfDelegate.

system_tray_notifier_(new SystemTrayNotifier),

window_cycle_controller_(new WindowCycleController),

« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/common/wm_window.h » ('j') | ash/shared/immersive_fullscreen_controller.cc » ('J')