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

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

Issue 2118643002: Move MaximizeModeController into ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: doh Created 4 years, 6 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
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a655c7327dea14ff89100921b5101473d695066a..55b34d6620f90e2766e1fc54937415053d444d6d 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -11,6 +11,7 @@
#include "ash/common/shell_window_ids.h"
#include "ash/common/system/tray/default_system_tray_delegate.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"
#include "ash/common/wm/window_resizer.h"
#include "ash/common/wm_activation_observer.h"
@@ -180,6 +181,12 @@ const DisplayInfo& WmShellMus::GetDisplayInfo(int64_t display_id) const {
return fake_info;
}
+bool WmShellMus::IsActiveDisplayId(int64_t display_id) const {
+ // TODO: implement http://crbug.com/622480.
+ NOTIMPLEMENTED();
+ return true;
+}
+
bool WmShellMus::IsForceMaximizeOnFirstRun() {
NOTIMPLEMENTED();
return false;
@@ -233,6 +240,13 @@ WmShellMus::CreateMaximizeModeEventHandler() {
return nullptr;
}
+std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
+WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() {
+ // TODO: needs implementation for mus, http://crbug.com/624967.
+ NOTIMPLEMENTED();
+ return nullptr;
+}
+
void WmShellMus::OnOverviewModeStarting() {
FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
OnOverviewModeStarting());
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698