Refactoring display configuration state to allow generic state objects

ash/display/display_change_observer_chromeos.h

Index: ash/display/display_change_observer_chromeos.h
diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h
index 59c2dee2d97ce48e01905f9c2fe48f01c77a842d..c86836e29a7a74d7dd7b3bcc7adf37c2fc911a53 100644
--- a/ash/display/display_change_observer_chromeos.h
+++ b/ash/display/display_change_observer_chromeos.h
@@ -24,7 +24,7 @@ class DisplayChangeObserver
  public:
   // Returns the resolution list.
   ASH_EXPORT static std::vector<DisplayMode> GetDisplayModeList(
-      const chromeos::OutputConfigurator::OutputSnapshot& output);
+      const chromeos::OutputConfigurator::DisplayState& output);
 
   DisplayChangeObserver();
   virtual ~DisplayChangeObserver();
@@ -33,13 +33,11 @@ class DisplayChangeObserver
   virtual ui::OutputState GetStateForDisplayIds(
       const std::vector<int64>& outputs) const OVERRIDE;
   virtual bool GetResolutionForDisplayId(int64 display_id,
-                                         int* width,
-                                         int* height) const OVERRIDE;
+                                         gfx::Size* size) const OVERRIDE;
 
   // Overriden from chromeos::OutputConfigurator::Observer:
   virtual void OnDisplayModeChanged(
-      const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs)
-      OVERRIDE;
+      const chromeos::OutputConfigurator::DisplayStateList& outputs) OVERRIDE;
 
   // Overriden from ShellObserver:
   virtual void OnAppTerminating() OVERRIDE;