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

Unified Diff: chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc

Issue 2208613002: Remove MOJO_SHELL_CLIENT define. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot merge 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/chromeos/system/input_device_settings_impl_ozone.cc
diff --git a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
index 2151480811628c4684f866877b4c9cf4a66bacf1..10808ff3dbc4e2b8f1a0268f27a8c4d4233a1b44 100644
--- a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
+++ b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
@@ -8,13 +8,10 @@
#include "base/sys_info.h"
#include "chrome/browser/chromeos/system/fake_input_device_settings.h"
#include "content/public/browser/browser_thread.h"
+#include "services/shell/runner/common/client_util.h"
#include "ui/ozone/public/input_controller.h"
#include "ui/ozone/public/ozone_platform.h"
-#if defined(MOJO_SHELL_CLIENT)
-#include "services/shell/runner/common/client_util.h"
-#endif
-
namespace chromeos {
namespace system {
@@ -23,11 +20,7 @@ namespace {
InputDeviceSettings* g_instance = nullptr;
std::unique_ptr<ui::InputController> CreateStubInputControllerIfNecessary() {
-#if defined(MOJO_SHELL_CLIENT)
return shell::ShellIsRemote() ? ui::CreateStubInputController() : nullptr;
-#else
- return nullptr;
-#endif
}
// InputDeviceSettings for Linux without X11 (a.k.a. Ozone).

Powered by Google App Engine
This is Rietveld 408576698