| Index: ui/display/chromeos/output_configurator.cc
|
| diff --git a/ui/display/chromeos/output_configurator.cc b/ui/display/chromeos/output_configurator.cc
|
| index 1a98b1d8b2c31b2eaf5eb3b68012542af4125f5a..7dfece2743e46bb0c2df3d05cf68016bcd31e155 100644
|
| --- a/ui/display/chromeos/output_configurator.cc
|
| +++ b/ui/display/chromeos/output_configurator.cc
|
| @@ -98,8 +98,6 @@ OutputConfigurator::DisplayState::DisplayState()
|
| selected_mode(NULL),
|
| mirror_mode(NULL) {}
|
|
|
| -OutputConfigurator::DisplayState::~DisplayState() {}
|
| -
|
| bool OutputConfigurator::TestApi::TriggerConfigureTimeout() {
|
| if (configurator_->configure_timer_.get() &&
|
| configurator_->configure_timer_->IsRunning()) {
|
| @@ -381,19 +379,25 @@ bool OutputConfigurator::EnableOutputProtection(
|
| return true;
|
| }
|
|
|
| +void OutputConfigurator::GetAvailableColorCalibrationProfiles(
|
| + int64 display_id,
|
| + std::vector<ui::ColorCalibrationProfile>* profiles) {
|
| + for (size_t i = 0; i < cached_outputs_.size(); ++i) {
|
| + if (cached_outputs_[i].display &&
|
| + cached_outputs_[i].display->display_id() == display_id) {
|
| + native_display_delegate_->GetAvailableColorCalibrationProfiles(
|
| + *cached_outputs_[i].display, profiles);
|
| + return;
|
| + }
|
| + }
|
| +}
|
| +
|
| bool OutputConfigurator::SetColorCalibrationProfile(
|
| int64 display_id,
|
| ui::ColorCalibrationProfile new_profile) {
|
| for (size_t i = 0; i < cached_outputs_.size(); ++i) {
|
| if (cached_outputs_[i].display &&
|
| cached_outputs_[i].display->display_id() == display_id) {
|
| - std::vector<ColorCalibrationProfile>::const_iterator iter =
|
| - std::find(cached_outputs_[i].available_color_profiles.begin(),
|
| - cached_outputs_[i].available_color_profiles.end(),
|
| - new_profile);
|
| - if (iter == cached_outputs_[i].available_color_profiles.end())
|
| - return false;
|
| -
|
| return native_display_delegate_->SetColorCalibrationProfile(
|
| *cached_outputs_[i].display, new_profile);
|
| }
|
|
|