Make ash::DisplayMode more like ui::DisplayMode

ash/accelerators/accelerator_commands_aura.cc

 // Copyright 2013 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 "ash/accelerators/accelerator_commands_aura.h"
 
+#include "ash/common/display/display_info.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/shell.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "base/metrics/user_metrics.h"
 
 namespace ash {
 namespace accelerators {
@@ skipping 15 matching lines @@
     base::RecordAction(base::UserMetricsAction("Accel_Scale_Ui_Up"));
   else
     base::RecordAction(base::UserMetricsAction("Accel_Scale_Ui_Down"));
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
   int64_t display_id = display_manager->IsInUnifiedMode()
                            ? DisplayManager::kUnifiedDisplayId
                            : display_manager->GetDisplayIdForUIScaling();
   const DisplayInfo& display_info = display_manager->GetDisplayInfo(display_id);
-  DisplayMode mode;
 
-  if (display_manager->IsInUnifiedMode()) {
-    if (!GetDisplayModeForNextResolution(display_info, up, &mode))
-      return false;
-  } else {
-    if (!GetDisplayModeForNextUIScale(display_info, up, &mode))
-      return false;
-  }
+  scoped_refptr<DisplayMode> mode;
+  if (display_manager->IsInUnifiedMode())
+    mode = GetDisplayModeForNextResolution(display_info, up);
+  else
+    mode = GetDisplayModeForNextUIScale(display_info, up);
+
+  if (!mode)
+    return false;

[oshima, 2016/08/04 17:54:00]

optional nit:

 return mode ? .. : false;

   return display_manager->SetDisplayMode(display_id, mode);
 }
 
 void ResetInternalDisplayZoom() {
   base::RecordAction(base::UserMetricsAction("Accel_Scale_Ui_Reset"));
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
   if (display_manager->IsInUnifiedMode()) {
     const DisplayInfo& display_info =
         display_manager->GetDisplayInfo(DisplayManager::kUnifiedDisplayId);
-    const std::vector<DisplayMode>& modes = display_info.display_modes();
-    auto iter =
-        std::find_if(modes.begin(), modes.end(),
-                     [](const DisplayMode& mode) { return mode.native; });
+    const DisplayInfo::DisplayModeList& modes = display_info.display_modes();
+    auto iter = std::find_if(
+        modes.begin(), modes.end(),
+        [](const scoped_refptr<DisplayMode>& mode) { return mode->native(); });
     display_manager->SetDisplayMode(DisplayManager::kUnifiedDisplayId, *iter);
   } else {
     SetDisplayUIScale(display_manager->GetDisplayIdForUIScaling(), 1.0f);
   }
 }
 
 void Unpin() {
   WmWindow* pinned_window =
       Shell::GetInstance()->screen_pinning_controller()->pinned_window();
   if (pinned_window)
     pinned_window->GetWindowState()->Restore();
 }
 
 }  // namespace accelerators
 }  // namespace ash