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

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

Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
8 #include "ui/ozone/public/input_controller.h" 9 #include "ui/ozone/public/input_controller.h"
9 #include "ui/ozone/public/ozone_platform.h" 10 #include "ui/ozone/public/ozone_platform.h"
10 11
11 namespace chromeos { 12 namespace chromeos {
12 namespace system { 13 namespace system {
13 14
14 namespace { 15 namespace {
15 16
16 InputDeviceSettings* g_instance = nullptr; 17 InputDeviceSettings* g_instance = nullptr;
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 void InputDeviceSettings::SetSettingsForTesting( 154 void InputDeviceSettings::SetSettingsForTesting(
154 InputDeviceSettings* test_settings) { 155 InputDeviceSettings* test_settings) {
155 if (g_test_instance == test_settings) 156 if (g_test_instance == test_settings)
156 return; 157 return;
157 delete g_test_instance; 158 delete g_test_instance;
158 g_test_instance = test_settings; 159 g_test_instance = test_settings;
159 } 160 }
160 161
161 } // namespace system 162 } // namespace system
162 } // namespace chromeos 163 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698