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

Unified Diff: ash/aura/wm_shell_aura.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/aura/wm_shell_aura.h ('k') | ash/common/ash_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 98f8c064052b2b9e2573708b19a28d515ed6c9d4..90a6d84fae0f93ce17e362d0fe62e5407df9e2ed 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -7,6 +7,7 @@
#include "ash/aura/wm_window_aura.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_observer.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/overview/window_selector_controller.h"
#include "ash/common/wm_activation_observer.h"
@@ -27,6 +28,14 @@
#include "ash/virtual_keyboard_controller.h"
#endif
+#if defined(USE_X11)
+#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
+#endif
+
+#if defined(USE_OZONE)
+#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
+#endif
+
namespace ash {
WmShellAura::WmShellAura() {
@@ -79,6 +88,10 @@ const DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const {
return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id);
}
+bool WmShellAura::IsActiveDisplayId(int64_t display_id) const {
+ return Shell::GetInstance()->display_manager()->IsActiveDisplayId(display_id);
+}
+
bool WmShellAura::IsForceMaximizeOnFirstRun() {
return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();
}
@@ -128,6 +141,16 @@ WmShellAura::CreateMaximizeModeEventHandler() {
return base::WrapUnique(new wm::MaximizeModeEventHandlerAura);
}
+std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
+WmShellAura::CreateScopedDisableInternalMouseAndKeyboard() {
+#if defined(USE_X11)
+ return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardX11);
+#elif defined(USE_OZONE)
+ return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone);
+#endif
+ return nullptr;
+}
+
void WmShellAura::OnOverviewModeStarting() {
FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
OnOverviewModeStarting());
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/ash_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698