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

Side by Side Diff: ui/display/chromeos/display_util.h

Issue 1019623002: Remove DisplayState from the public interface for DisplayConfigurator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated Created 5 years, 9 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 #ifndef UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_H_ 5 #ifndef UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_H_
6 #define UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_H_ 6 #define UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ui/display/chromeos/display_configurator.h" 11 #include "third_party/cros_system_api/dbus/service_constants.h"
12 #include "ui/display/display_export.h"
12 #include "ui/display/types/display_constants.h" 13 #include "ui/display/types/display_constants.h"
13 14
14 namespace ui { 15 namespace ui {
15 16
17 class DisplaySnapshot;
18
16 // Returns a string describing |state|. 19 // Returns a string describing |state|.
17 std::string DisplayPowerStateToString(chromeos::DisplayPowerState state); 20 std::string DisplayPowerStateToString(chromeos::DisplayPowerState state);
18 21
19 // Returns a string describing |state|. 22 // Returns a string describing |state|.
20 std::string MultipleDisplayStateToString(MultipleDisplayState state); 23 std::string MultipleDisplayStateToString(MultipleDisplayState state);
21 24
22 // Returns the number of displays in |displays| that should be turned on, per 25 // Returns the number of displays in |displays| that should be turned on, per
23 // |state|. If |display_power| is non-NULL, it is updated to contain the 26 // |state|. If |display_power| is non-NULL, it is updated to contain the
24 // on/off state of each corresponding entry in |displays|. 27 // on/off state of each corresponding entry in |displays|.
25 int DISPLAY_EXPORT GetDisplayPower( 28 int DISPLAY_EXPORT
26 const std::vector<DisplayConfigurator::DisplayState>& display_states, 29 GetDisplayPower(const std::vector<DisplaySnapshot*>& displays,
27 chromeos::DisplayPowerState state, 30 chromeos::DisplayPowerState state,
28 std::vector<bool>* display_power); 31 std::vector<bool>* display_power);
29 32
30 } // namespace ui 33 } // namespace ui
31 34
32 #endif // UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_H_ 35 #endif // UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_H_
OLDNEW
« no previous file with comments | « ui/display/chromeos/display_configurator_unittest.cc ('k') | ui/display/chromeos/display_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698