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

Unified Diff: ui/display/chromeos/display_util.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/display/chromeos/display_util.h ('k') | ui/display/chromeos/update_display_configuration_task.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/display_util.cc
diff --git a/ui/display/chromeos/display_util.cc b/ui/display/chromeos/display_util.cc
index 212144cf20740c297d7d081a20cddd4bbc0c5934..a62e47cd6e4b023d3d0f874a36526291eb01e6e1 100644
--- a/ui/display/chromeos/display_util.cc
+++ b/ui/display/chromeos/display_util.cc
@@ -4,6 +4,7 @@
#include "ui/display/chromeos/display_util.h"
+#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "ui/display/types/display_snapshot.h"
@@ -44,17 +45,15 @@ std::string MultipleDisplayStateToString(MultipleDisplayState state) {
return "INVALID";
}
-int GetDisplayPower(
- const std::vector<DisplayConfigurator::DisplayState>& display_states,
- chromeos::DisplayPowerState state,
- std::vector<bool>* display_power) {
+int GetDisplayPower(const std::vector<DisplaySnapshot*>& displays,
+ chromeos::DisplayPowerState state,
+ std::vector<bool>* display_power) {
int num_on_displays = 0;
if (display_power)
- display_power->resize(display_states.size());
+ display_power->resize(displays.size());
- for (size_t i = 0; i < display_states.size(); ++i) {
- bool internal =
- display_states[i].display->type() == DISPLAY_CONNECTION_TYPE_INTERNAL;
+ for (size_t i = 0; i < displays.size(); ++i) {
+ bool internal = displays[i]->type() == DISPLAY_CONNECTION_TYPE_INTERNAL;
bool on =
state == chromeos::DISPLAY_POWER_ALL_ON ||
(state == chromeos::DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON &&
« no previous file with comments | « ui/display/chromeos/display_util.h ('k') | ui/display/chromeos/update_display_configuration_task.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698