ash/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.cc

diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc

index 7dec02110d60b2dfa642865d18be44fbc3f6bde4..b8a5c61eb8c4ca1634b0f6b6aaff8871a3fbbedc 100644

--- a/ash/mus/bridge/wm_shell_mus.cc

+++ b/ash/mus/bridge/wm_shell_mus.cc

@@ -14,7 +14,6 @@

#include "ash/common/shell_observer.h"

#include "ash/common/shell_window_ids.h"

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

-#include "ash/common/wm/immersive/wm_immersive_fullscreen_controller.h"

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

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

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

@@ -29,6 +28,7 @@

#include "ash/mus/drag_window_resizer.h"

#include "ash/mus/root_window_controller.h"

#include "ash/mus/window_manager.h"

+#include "ash/shared/immersive_fullscreen_controller.h"

#include "base/memory/ptr_util.h"

#include "components/user_manager/user_info_impl.h"

#include "services/ui/common/util.h"

@@ -338,7 +338,7 @@ WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() {

return nullptr;

}

-std::unique_ptr<WmImmersiveFullscreenController>

+std::unique_ptr<ImmersiveFullscreenController>

WmShellMus::CreateImmersiveFullscreenController() {

// TODO(sky): port ImmersiveFullscreenController, http://crbug.com/548435.

return nullptr;

« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/bridge/wm_window_mus.h » ('j') | ash/shared/immersive_fullscreen_controller.cc » ('J')