Refactors getting available color profiles code.

ui/display/chromeos/output_configurator.h

 // 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.
 
 #ifndef UI_DISPLAY_CHROMEOS_OUTPUT_CONFIGURATOR_H_
 #define UI_DISPLAY_CHROMEOS_OUTPUT_CONFIGURATOR_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 29 matching lines @@
     CoordinateTransformation();
 
     float x_scale;
     float x_offset;
     float y_scale;
     float y_offset;
   };
 
   struct DisplayState {
     DisplayState();
-    ~DisplayState();
 
     DisplaySnapshot* display;  // Not owned.
 
     // XInput device ID or 0 if this output isn't a touchscreen.
     int touch_device_id;
 
     CoordinateTransformation transform;
 
     // User-selected mode for the output.
     const DisplayMode* selected_mode;
 
     // Mode used when displaying the same desktop on multiple outputs.
     const DisplayMode* mirror_mode;
-
-    std::vector<ui::ColorCalibrationProfile> available_color_profiles;
   };
 
   typedef std::vector<DisplayState> DisplayStateList;
 
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Called after the display mode has been changed. |output| contains the
     // just-applied configuration. Note that the X server is no longer grabbed
@@ skipping 179 matching lines @@
                                    uint32_t* protection_mask);
 
   // Requests the desired protection methods.
   // |protection_mask| is the desired protection methods, which is a bitmask
   // of the OutputProtectionMethod values.
   // Returns true when the protection request has been made.
   bool EnableOutputProtection(OutputProtectionClientId client_id,
                               int64 display_id,
                               uint32_t desired_protection_mask);
 
+  // Checks the available color profiles for |display_id| and fills the result
+  // into |profiles|.
+  void GetAvailableColorCalibrationProfiles(
+      int64 display_id,
+      std::vector<ui::ColorCalibrationProfile>* profiles);
+
   // Updates the color calibration to |new_profile|.
   bool SetColorCalibrationProfile(
       int64 display_id,
       ui::ColorCalibrationProfile new_profile);
 
  private:
   // Mapping a display_id to a protection request bitmask.
   typedef std::map<int64, uint32_t> DisplayProtections;
   // Mapping a client to its protection request.
   typedef std::map<OutputProtectionClientId, DisplayProtections>
@@ skipping 113 matching lines @@
 
   // Output protection requests of each client.
   ProtectionRequests client_protection_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_OUTPUT_CONFIGURATOR_H_