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

Unified Diff: ash/aura/wm_shell_aura.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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/content/shell_content_state.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 5f71ec40714db5e37d3edf5ef8e8d6ee61412f13..1d27a92fcd70393081701550212cfe248153b724 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -23,6 +23,7 @@
#include "ash/shared/immersive_fullscreen_controller.h"
#include "ash/shell.h"
#include "ash/touch/touch_uma.h"
+#include "ash/virtual_keyboard_controller.h"
#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/lock_state_controller.h"
#include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
@@ -37,10 +38,6 @@
#include "ui/display/manager/display_manager.h"
#include "ui/wm/public/activation_client.h"
-#if defined(OS_CHROMEOS)
-#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
@@ -291,7 +288,6 @@ bool WmShellAura::IsTouchDown() {
return aura::Env::GetInstance()->is_touch_down();
}
-#if defined(OS_CHROMEOS)
void WmShellAura::ToggleIgnoreExternalKeyboard() {
Shell::GetInstance()
->virtual_keyboard_controller()
@@ -301,7 +297,6 @@ void WmShellAura::ToggleIgnoreExternalKeyboard() {
void WmShellAura::SetLaserPointerEnabled(bool enabled) {
Shell::GetInstance()->laser_pointer_controller()->SetEnabled(enabled);
}
-#endif
void WmShellAura::OnWindowActivated(
aura::client::ActivationChangeObserver::ActivationReason reason,
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/content/shell_content_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698