Refactoring display configuration state to allow generic state objects

ash/wm/power_button_controller.cc

Index: ash/wm/power_button_controller.cc
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
index c7eeefab1ce8777ef42387d118c115ce9c382c10..70a10dea0d710b5b690f66fb787711d71c15772b 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -12,6 +12,7 @@
 #include "ash/wm/session_state_animator.h"
 #include "base/command_line.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/display/chromeos/display_snapshot.h"
 #include "ui/views/corewm/compound_event_filter.h"
 
 namespace ash {
@@ -116,16 +117,17 @@ void PowerButtonController::OnLockButtonEvent(
 }
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
-void PowerButtonController::OnDisplayModeChanged(
-    const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs) {
+void PowerButtonController::OnDisplayModeChanged(const std::vector<
+    chromeos::OutputConfigurator::InternalDisplayState>& outputs) {
   bool internal_display_off = false;
   bool external_display_on = false;
   for (size_t i = 0; i < outputs.size(); ++i) {
-    const chromeos::OutputConfigurator::OutputSnapshot& output = outputs[i];
-    if (output.type == ui::OUTPUT_TYPE_INTERNAL) {
-      if (!output.current_mode)
+    const chromeos::OutputConfigurator::InternalDisplayState& output =
+        outputs[i];
+    if (output.display->type() == ui::OUTPUT_TYPE_INTERNAL) {
+      if (!output.display->current_mode())
         internal_display_off = true;
-    } else if (output.current_mode) {
+    } else if (output.display->current_mode()) {
       external_display_on = true;
     }
   }