Refactors getting available color profiles code.

ui/display/chromeos/output_configurator.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/display/chromeos/output_configurator.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 80 matching lines @@
       x_offset(0.0),
       y_scale(1.0),
       y_offset(0.0) {}
 
 OutputConfigurator::DisplayState::DisplayState()
     : display(NULL),
       touch_device_id(0),
       selected_mode(NULL),
       mirror_mode(NULL) {}
 
-OutputConfigurator::DisplayState::~DisplayState() {}
-
 bool OutputConfigurator::TestApi::TriggerConfigureTimeout() {
   if (configurator_->configure_timer_.get() &&
       configurator_->configure_timer_->IsRunning()) {
     configurator_->configure_timer_.reset();
     configurator_->ConfigureOutputs();
     return true;
   } else {
     return false;
   }
 }
@@ skipping 261 matching lines @@
       if (client_protection_requests_[client_id].size() == 0)
         client_protection_requests_.erase(client_id);
     }
   } else {
     client_protection_requests_[client_id][display_id] = desired_method_mask;
   }
 
   return true;
 }
 
+std::vector<ui::ColorCalibrationProfile>
+OutputConfigurator::GetAvailableColorCalibrationProfiles(
+    int64 display_id) {
+  for (size_t i = 0; i < cached_outputs_.size(); ++i) {
+    if (cached_outputs_[i].display &&
+        cached_outputs_[i].display->display_id() == display_id) {
+      return native_display_delegate_->GetAvailableColorCalibrationProfiles(
+          *cached_outputs_[i].display);
+    }
+  }
+
+  return std::vector<ui::ColorCalibrationProfile>();
+}
+
 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);
     }
   }
 
   return false;
 }
 
 void OutputConfigurator::PrepareForExit() {
   configure_display_ = false;
@@ skipping 610 matching lines @@
   float width_ratio = static_cast<float>(mirror_mode_info->size().width()) /
                       static_cast<float>(native_mode_info->size().width());
   float height_ratio = static_cast<float>(mirror_mode_info->size().height()) /
                        static_cast<float>(native_mode_info->size().height());
 
   area_ratio = width_ratio * height_ratio;
   return area_ratio;
 }
 
 }  // namespace ui