Remove DisplayState from the public interface for DisplayConfigurator

ui/display/chromeos/display_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_DISPLAY_CONFIGURATOR_H_
 #define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 24 matching lines @@
 class UpdateDisplayConfigurationTask;
 
 // This class interacts directly with the system display configurator.
 class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
  public:
   typedef uint64_t ContentProtectionClientId;
   static const ContentProtectionClientId kInvalidClientId = 0;
 
   typedef base::Callback<void(bool)> ConfigurationCallback;
 
-  struct DisplayState {
-    DisplayState();
-
-    DisplaySnapshot* display;  // Not owned.
-
-    // User-selected mode for the display.
-    const DisplayMode* selected_mode;
-
-    // Mode used when displaying the same desktop on multiple displays.
-    const DisplayMode* mirror_mode;
-  };
-
-  typedef std::vector<DisplayState> DisplayStateList;
+  typedef std::vector<DisplaySnapshot*> DisplayStateList;

[dnicoara, 2015/03/18 20:01:50]

I was thinking of renaming this as well. My though was just simplify it to
"DisplayList". What do you think?

[oshima, 2015/03/18 23:02:45]

I don't have strong opinion, but I'd prefer to keep it something not DisplayList
because there is gfx::Display.

 
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Called after the display mode has been changed. |display| contains the
     // just-applied configuration. Note that the X server is no longer grabbed
     // when this method is called, so the actual configuration could've changed
     // already.
     virtual void OnDisplayModeChanged(
@@ skipping 41 matching lines @@
         const = 0;
 
     virtual StateController* GetStateController() const = 0;
 
     // Returns the current display state.
     virtual MultipleDisplayState GetDisplayState() const = 0;
 
     // Returns the current power state.
     virtual chromeos::DisplayPowerState GetPowerState() const = 0;
 
-    // Parses the |displays| into a list of DisplayStates. This effectively adds
-    // |mirror_mode| and |selected_mode| to the returned results.
-    // TODO(dnicoara): This operation doesn't depend on state and could be done
-    // directly in |GetDisplayLayout()|. Though I need to make sure that there
-    // are no uses for those fields outside DisplayConfigurator.
-    virtual std::vector<DisplayState> ParseDisplays(
-        const std::vector<DisplaySnapshot*>& displays) const = 0;
-
     // Based on the given |displays|, display state and power state, it will
     // create display configuration requests which will then be used to
     // configure the hardware. The requested configuration is stored in
     // |requests| and |framebuffer_size|.
     virtual bool GetDisplayLayout(
-        const std::vector<DisplayState>& displays,
+        const std::vector<DisplaySnapshot*>& displays,
         MultipleDisplayState new_display_state,
         chromeos::DisplayPowerState new_power_state,
         std::vector<DisplayConfigureRequest>* requests,
         gfx::Size* framebuffer_size) const = 0;
   };
 
   // Helper class used by tests.
   class TestApi {
    public:
     TestApi(DisplayConfigurator* configurator) : configurator_(configurator) {}
@@ skipping 33 matching lines @@
       const gfx::Size& size);
 
   DisplayConfigurator();
   ~DisplayConfigurator() override;
 
   MultipleDisplayState display_state() const { return current_display_state_; }
   chromeos::DisplayPowerState requested_power_state() const {
     return requested_power_state_;
   }
   const gfx::Size framebuffer_size() const { return framebuffer_size_; }
-  const std::vector<DisplayState>& cached_displays() const {
+  const std::vector<DisplaySnapshot*>& cached_displays() const {
     return cached_displays_;
   }
 
   // Called when an external process no longer needs to control the display
   // and Chrome can take control.
   void TakeControl();
 
   // Called when an external process needs to control the display and thus
   // Chrome should relinquish it.
   void RelinquishControl();
@@ skipping 110 matching lines @@
   void RestoreRequestedPowerStateAfterResume();
 
   // Notifies observers about an attempted state change.
   void NotifyObservers(bool success, MultipleDisplayState attempted_state);
 
   // Returns the display state that should be used with |cached_displays_| while
   // in |power_state|.
   MultipleDisplayState ChooseDisplayState(
       chromeos::DisplayPowerState power_state) const;
 
-  // Returns the ratio between mirrored mode area and native mode area:
-  // (mirror_mode_width * mirrow_mode_height) / (native_width * native_height)
-  float GetMirroredDisplayAreaRatio(const DisplayState& display);
-
   // Returns true if in either hardware or software mirroring mode.
   bool IsMirroring() const;
 
   // Applies display protections according to requests.
   bool ApplyProtections(const ContentProtections& requests);
 
   // If |configuration_task_| isn't initialized, initializes it and starts the
   // configuration task.
   void RunPendingConfiguration();
 
   // Callback for |configuration_taks_|. When the configuration process finishes
   // this is called with the result (|success|) and the updated display state.
   void OnConfigured(bool success,
-                    const std::vector<DisplayState>& displays,
+                    const std::vector<DisplaySnapshot*>& displays,
                     const gfx::Size& framebuffer_size,
                     MultipleDisplayState new_display_state,
                     chromeos::DisplayPowerState new_power_state);
 
   // Helps in identifying if a configuration task needs to be scheduled.
   // Return true if any of the |requested_*| parameters have been updated. False
   // otherwise.
   bool ShouldRunConfigurationTask() const;
 
   // Helper functions which will call the callbacks in
@@ skipping 81 matching lines @@
 
   // This must be the last variable.
   base::WeakPtrFactory<DisplayConfigurator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_