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

Side by Side Diff: chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
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 "base/sys_info.h" 8 #include "base/sys_info.h"
9 #include "chrome/browser/chromeos/system/fake_input_device_settings.h" 9 #include "chrome/browser/chromeos/system/fake_input_device_settings.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 #include "services/shell/runner/common/client_util.h" 11 #include "services/service_manager/runner/common/client_util.h"
12 #include "ui/ozone/public/input_controller.h" 12 #include "ui/ozone/public/input_controller.h"
13 #include "ui/ozone/public/ozone_platform.h" 13 #include "ui/ozone/public/ozone_platform.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 namespace system { 16 namespace system {
17 17
18 namespace { 18 namespace {
19 19
20 InputDeviceSettings* g_instance = nullptr; 20 InputDeviceSettings* g_instance = nullptr;
21 21
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 if (base::SysInfo::IsRunningOnChromeOS()) 166 if (base::SysInfo::IsRunningOnChromeOS())
167 g_instance = new InputDeviceSettingsImplOzone; 167 g_instance = new InputDeviceSettingsImplOzone;
168 else 168 else
169 g_instance = new FakeInputDeviceSettings(); 169 g_instance = new FakeInputDeviceSettings();
170 } 170 }
171 return g_instance; 171 return g_instance;
172 } 172 }
173 173
174 } // namespace system 174 } // namespace system
175 } // namespace chromeos 175 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698