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

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

Issue 1877533002: mash: Fix launching chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « no previous file | content/browser/gpu/gpu_data_manager_impl_private.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c0ad7b67fdb38101dde0b3e21761ac0e67cc5ab1..7c6fa49dbe96cbed51af3d09468cdee201ba0fb5 100644
--- a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
+++ b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
@@ -54,11 +54,16 @@ class InputDeviceSettingsImplOzone : public InputDeviceSettings {
DISALLOW_COPY_AND_ASSIGN(InputDeviceSettingsImplOzone);
};
+ui::InputController* GetInputController() {
+ return // ui::OzonePlatform::GetInstance() ?
+ // ui::OzonePlatform::GetInstance()->GetInputController() :
+ ui::CreateStubInputController().release();
+}
+
InputDeviceSettingsImplOzone::InputDeviceSettingsImplOzone()
- : input_controller_(
- ui::OzonePlatform::GetInstance()->GetInputController()) {
+ : input_controller_(GetInputController()) {
// Make sure the input controller does exist.
- DCHECK(ui::OzonePlatform::GetInstance()->GetInputController());
+ DCHECK(input_controller_);
}
void InputDeviceSettingsImplOzone::TouchpadExists(
« no previous file with comments | « no previous file | content/browser/gpu/gpu_data_manager_impl_private.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698