Remove DisplayState from the public interface for DisplayConfigurator

ui/display/chromeos/update_display_configuration_task.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/update_display_configuration_task.h"
 
 #include "ui/display/chromeos/configure_displays_task.h"
 #include "ui/display/chromeos/display_util.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/native_display_delegate.h"
@@ skipping 27 matching lines @@
 }
 
 void UpdateDisplayConfigurationTask::Run() {
   delegate_->GetDisplays(
       base::Bind(&UpdateDisplayConfigurationTask::OnDisplaysUpdated,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void UpdateDisplayConfigurationTask::OnDisplaysUpdated(
     const std::vector<DisplaySnapshot*>& displays) {
-  cached_displays_ = layout_manager_->ParseDisplays(displays);
+  cached_displays_ = displays;
 
   if (cached_displays_.size() > 1 && background_color_argb_)
     delegate_->SetBackgroundColor(background_color_argb_);
 
   // If the user hasn't requested a display state, update it using the requested
   // power state.
   if (new_display_state_ == MULTIPLE_DISPLAY_STATE_INVALID)
     new_display_state_ = ChooseDisplayState();
 
   VLOG(1) << "OnDisplaysUpdated: new_display_state="
@@ skipping 93 matching lines @@
   return new_power_state_ != chromeos::DISPLAY_POWER_ALL_OFF &&
          (layout_manager_->GetPowerState() != new_power_state_ ||
           (power_flags_ & DisplayConfigurator::kSetDisplayPowerForceProbe));
 }
 
 bool UpdateDisplayConfigurationTask::ShouldConfigure() const {
   if (force_configure_)
     return true;
 
   if (cached_displays_.size() == 1 &&
-      cached_displays_[0].display->type() == DISPLAY_CONNECTION_TYPE_INTERNAL)
+      cached_displays_[0]->type() == DISPLAY_CONNECTION_TYPE_INTERNAL)
     return true;
 
   if (!(power_flags_ &
         DisplayConfigurator::kSetDisplayPowerOnlyIfSingleInternalDisplay))
     return true;
 
   if (new_display_state_ != layout_manager_->GetDisplayState())
     return true;
 
   return false;
@@ skipping 16 matching lines @@
       }
       if (num_on_displays >= 3) {
         return MULTIPLE_DISPLAY_STATE_MULTI_EXTENDED;
       } else if (cached_displays_.size() == 2) {
         if (!layout_manager_->GetStateController())
           return MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
         // With either both displays on or both displays off, use one of the
         // dual modes.
         std::vector<int64_t> display_ids;
         for (size_t i = 0; i < cached_displays_.size(); ++i)
-          display_ids.push_back(cached_displays_[i].display->display_id());
+          display_ids.push_back(cached_displays_[i]->display_id());
 
         return layout_manager_->GetStateController()->GetStateForDisplayIds(
             display_ids);
       }
       NOTREACHED();
     }
   }
   return MULTIPLE_DISPLAY_STATE_INVALID;
 }
 
 }  // namespace ui