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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/system/input_device_settings.h" 5 #include "chrome/browser/chromeos/system/input_device_settings.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 #include "ui/ozone/public/input_controller.h" 9 #include "ui/ozone/public/input_controller.h"
10 #include "ui/ozone/public/ozone_platform.h" 10 #include "ui/ozone/public/ozone_platform.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // session. 47 // session.
48 ui::InputController* input_controller_; 48 ui::InputController* input_controller_;
49 49
50 // Respective device setting objects. 50 // Respective device setting objects.
51 TouchpadSettings current_touchpad_settings_; 51 TouchpadSettings current_touchpad_settings_;
52 MouseSettings current_mouse_settings_; 52 MouseSettings current_mouse_settings_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(InputDeviceSettingsImplOzone); 54 DISALLOW_COPY_AND_ASSIGN(InputDeviceSettingsImplOzone);
55 }; 55 };
56 56
57 ui::InputController* GetInputController() {
58 return // ui::OzonePlatform::GetInstance() ?
59 // ui::OzonePlatform::GetInstance()->GetInputController() :
60 ui::CreateStubInputController().release();
61 }
62
57 InputDeviceSettingsImplOzone::InputDeviceSettingsImplOzone() 63 InputDeviceSettingsImplOzone::InputDeviceSettingsImplOzone()
58 : input_controller_( 64 : input_controller_(GetInputController()) {
59 ui::OzonePlatform::GetInstance()->GetInputController()) {
60 // Make sure the input controller does exist. 65 // Make sure the input controller does exist.
61 DCHECK(ui::OzonePlatform::GetInstance()->GetInputController()); 66 DCHECK(input_controller_);
62 } 67 }
63 68
64 void InputDeviceSettingsImplOzone::TouchpadExists( 69 void InputDeviceSettingsImplOzone::TouchpadExists(
65 const DeviceExistsCallback& callback) { 70 const DeviceExistsCallback& callback) {
66 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 71 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
67 callback.Run(input_controller_->HasTouchpad()); 72 callback.Run(input_controller_->HasTouchpad());
68 } 73 }
69 74
70 void InputDeviceSettingsImplOzone::UpdateTouchpadSettings( 75 void InputDeviceSettingsImplOzone::UpdateTouchpadSettings(
71 const TouchpadSettings& settings) { 76 const TouchpadSettings& settings) {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 void InputDeviceSettings::SetSettingsForTesting( 159 void InputDeviceSettings::SetSettingsForTesting(
155 InputDeviceSettings* test_settings) { 160 InputDeviceSettings* test_settings) {
156 if (g_test_instance == test_settings) 161 if (g_test_instance == test_settings)
157 return; 162 return;
158 delete g_test_instance; 163 delete g_test_instance;
159 g_test_instance = test_settings; 164 g_test_instance = test_settings;
160 } 165 }
161 166
162 } // namespace system 167 } // namespace system
163 } // namespace chromeos 168 } // namespace chromeos
OLDNEW
« 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