ui/display/chromeos/update_display_configuration_task.cc - Issue 1019623002: Remove DisplayState from the public interface for DisplayConfigurator

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/display/chromeos/update_display_configuration_task.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/update_display_configuration_task.h ('k') | ui/display/chromeos/update_display_configuration_task_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/display/chromeos/update_display_configuration_task.cc

diff --git a/ui/display/chromeos/update_display_configuration_task.cc b/ui/display/chromeos/update_display_configuration_task.cc

index fea9214dc021c899b1aac6c41c4eec548b683a29..efa2d6d8bb63a79800c71ed4b4d42837d827f000 100644

--- a/ui/display/chromeos/update_display_configuration_task.cc

+++ b/ui/display/chromeos/update_display_configuration_task.cc

@@ -45,7 +45,7 @@ void UpdateDisplayConfigurationTask::Run() {

void UpdateDisplayConfigurationTask::OnDisplaysUpdated(

const std::vector<DisplaySnapshot*>& displays) {

- cached_displays_ = layout_manager_->ParseDisplays(displays);

+ cached_displays_ = displays;

if (cached_displays_.size() > 1 && background_color_argb_)

delegate_->SetBackgroundColor(background_color_argb_);

@@ -159,7 +159,7 @@ bool UpdateDisplayConfigurationTask::ShouldConfigure() const {

return true;

if (cached_displays_.size() == 1 &&

- cached_displays_[0].display->type() == DISPLAY_CONNECTION_TYPE_INTERNAL)

+ cached_displays_[0]->type() == DISPLAY_CONNECTION_TYPE_INTERNAL)

return true;

if (!(power_flags_ &

@@ -196,7 +196,7 @@ MultipleDisplayState UpdateDisplayConfigurationTask::ChooseDisplayState()

// dual modes.

std::vector<int64_t> display_ids;

for (size_t i = 0; i < cached_displays_.size(); ++i)

- display_ids.push_back(cached_displays_[i].display->display_id());

+ display_ids.push_back(cached_displays_[i]->display_id());

return layout_manager_->GetStateController()->GetStateForDisplayIds(

display_ids);