Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1914)

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2277563002: Wires up immersive mode for chrome and mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crash 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 e2eb353e1b57e430b3afc5446e339fd99e6daf00..2435c7ad2106e7194613ef20b373296d935b454f 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -22,6 +22,7 @@
#include "ash/common/wm_activation_observer.h"
#include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
#include "ash/mus/accelerators/accelerator_controller_registrar.h"
+#include "ash/mus/bridge/immersive_handler_factory_mus.h"
#include "ash/mus/bridge/wm_root_window_controller_mus.h"
#include "ash/mus/bridge/wm_window_mus.h"
#include "ash/mus/container_ids.h"
@@ -125,6 +126,7 @@ WmShellMus::WmShellMus(
SetAcceleratorController(base::MakeUnique<AcceleratorController>(
accelerator_controller_delegate_.get(),
accelerator_controller_registrar_.get()));
+ immersive_handler_factory_.reset(new ImmersiveHandlerFactoryMus);
CreateMaximizeModeController();
@@ -340,8 +342,7 @@ WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() {
std::unique_ptr<ImmersiveFullscreenController>
WmShellMus::CreateImmersiveFullscreenController() {
- // TODO(sky): port ImmersiveFullscreenController, http://crbug.com/548435.
- return nullptr;
+ return base::MakeUnique<ImmersiveFullscreenController>();
}
void WmShellMus::OnOverviewModeStarting() {

Powered by Google App Engine
This is Rietveld 408576698