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

Unified Diff: chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc

Issue 2277563002: Wires up immersive mode for chrome and mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback 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: chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc
index 1051b59e4616e9d03716d7e1d8162b119de42191..c96cd0624b613858d8bc91bf7b167d4b88758511 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/ui/views/frame/immersive_mode_controller_stub.h"
#if defined(USE_ASH)
-#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
#endif
@@ -13,13 +12,10 @@ namespace chrome {
ImmersiveModeController* CreateImmersiveModeController() {
#if defined(USE_ASH)
- if (!IsRunningInMash())
- return new ImmersiveModeControllerAsh();
-
- // TODO: http://crbug.com/548435
- NOTIMPLEMENTED();
-#endif // USE_ASH
+ return new ImmersiveModeControllerAsh();
+#else
return new ImmersiveModeControllerStub();
+#endif // USE_ASH
}
} // namespace chrome

Powered by Google App Engine
This is Rietveld 408576698