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

Side by Side Diff: ash/display/display_change_observer_chromeos.cc

Issue 618283003: Adds special support to the device manager for keyboards devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Do not run x11 test on non-x11 platforms. Created 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/display/display_change_observer_chromeos.h" 5 #include "ash/display/display_change_observer_chromeos.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string>
11 #include <utility>
10 #include <vector> 12 #include <vector>
11 13
12 #include "ash/ash_switches.h" 14 #include "ash/ash_switches.h"
13 #include "ash/display/display_info.h" 15 #include "ash/display/display_info.h"
14 #include "ash/display/display_layout_store.h" 16 #include "ash/display/display_layout_store.h"
15 #include "ash/display/display_manager.h" 17 #include "ash/display/display_manager.h"
16 #include "ash/shell.h" 18 #include "ash/shell.h"
17 #include "ash/touch/touchscreen_util.h" 19 #include "ash/touch/touchscreen_util.h"
18 #include "base/command_line.h" 20 #include "base/command_line.h"
19 #include "base/logging.h" 21 #include "base/logging.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 282
281 // static 283 // static
282 float DisplayChangeObserver::FindDeviceScaleFactor(float dpi) { 284 float DisplayChangeObserver::FindDeviceScaleFactor(float dpi) {
283 for (size_t i = 0; i < arraysize(kThresholdTable); ++i) { 285 for (size_t i = 0; i < arraysize(kThresholdTable); ++i) {
284 if (dpi > kThresholdTable[i].dpi) 286 if (dpi > kThresholdTable[i].dpi)
285 return kThresholdTable[i].device_scale_factor; 287 return kThresholdTable[i].device_scale_factor;
286 } 288 }
287 return 1.0f; 289 return 1.0f;
288 } 290 }
289 291
290 void DisplayChangeObserver::OnInputDeviceConfigurationChanged() { 292 void DisplayChangeObserver::OnTouchscreenDeviceConfigurationChanged() {
291 OnDisplayModeChanged( 293 OnDisplayModeChanged(
292 Shell::GetInstance()->display_configurator()->cached_displays()); 294 Shell::GetInstance()->display_configurator()->cached_displays());
293 } 295 }
294 296
297 void DisplayChangeObserver::OnKeyboardDeviceConfigurationChanged() {}
298
295 } // namespace ash 299 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698