Commit 8c21535c authored by Blake O'Hare's avatar Blake O'Hare Committed by Commit Bot

Remove "#if defined(OS_CHROMEOS)"'s in ui/keyboard

Thanks to http://crrev.com/c/1006742 ui/keyboard only builds for
OS_CHROMEOS and so it is safe to remove these checks now.

Change-Id: Ifedc08f863e3356490a85ec8c3f1749ad1e9081e
Reviewed-on: https://chromium-review.googlesource.com/1100357Reviewed-by: default avatarYuichiro Hanada <yhanada@chromium.org>
Commit-Queue: Blake O'Hare <blakeo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567143}
parent 73b85293
...@@ -41,12 +41,9 @@ ...@@ -41,12 +41,9 @@
#include "ui/keyboard/notification_manager.h" #include "ui/keyboard/notification_manager.h"
#include "ui/keyboard/queued_container_type.h" #include "ui/keyboard/queued_container_type.h"
#include "ui/keyboard/queued_display_change.h" #include "ui/keyboard/queued_display_change.h"
#include "ui/wm/core/window_animations.h"
#if defined(OS_CHROMEOS)
#include "ui/ozone/public/input_controller.h" #include "ui/ozone/public/input_controller.h"
#include "ui/ozone/public/ozone_platform.h" #include "ui/ozone/public/ozone_platform.h"
#endif // if defined(OS_CHROMEOS) #include "ui/wm/core/window_animations.h"
namespace { namespace {
...@@ -143,7 +140,6 @@ class KeyboardWindowDelegate : public aura::WindowDelegate { ...@@ -143,7 +140,6 @@ class KeyboardWindowDelegate : public aura::WindowDelegate {
}; };
void SetTouchEventLogging(bool enable) { void SetTouchEventLogging(bool enable) {
#if defined(OS_CHROMEOS)
// TODO(moshayedi): crbug.com/642863. Revisit when we have mojo interface for // TODO(moshayedi): crbug.com/642863. Revisit when we have mojo interface for
// InputController for processes that aren't mus-ws. // InputController for processes that aren't mus-ws.
if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS) if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS)
...@@ -152,7 +148,6 @@ void SetTouchEventLogging(bool enable) { ...@@ -152,7 +148,6 @@ void SetTouchEventLogging(bool enable) {
ui::OzonePlatform::GetInstance()->GetInputController(); ui::OzonePlatform::GetInstance()->GetInputController();
if (controller) if (controller)
controller->SetTouchEventLoggingEnabled(enable); controller->SetTouchEventLoggingEnabled(enable);
#endif // defined(OS_CHROMEOS)
} }
std::string StateToStr(keyboard::KeyboardControllerState state) { std::string StateToStr(keyboard::KeyboardControllerState state) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment