Unified Desktop: Support 2xDSF display

ash/display/display_util.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 ASH_DISPLAY_DISPLAY_UTIL_H_
 #define ASH_DISPLAY_DISPLAY_UTIL_H_
 
 #include <set>
+#include <utility>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/display/display_layout.h"
 
 namespace gfx {
 class Display;
 class Point;
 class Rect;
 class Size;
 }
 
 namespace ash {
 class AshWindowTreeHost;
 struct DisplayMode;
 class DisplayInfo;
 
 // Creates the display mode list for internal display
 // based on |native_mode|.
 ASH_EXPORT std::vector<DisplayMode> CreateInternalDisplayModeList(
     const DisplayMode& native_mode);
 
 // Creates the display mode list for unified display
 // based on |native_mode| and |scales|.
 ASH_EXPORT std::vector<DisplayMode> CreateUnifiedDisplayModeList(
     const DisplayMode& native_mode,
-    const std::set<float>& scales);
+    const std::set<std::pair<float, float>>& dsf_scale_list);
 
 // Gets the display mode for |resolution|. Returns false if no display
 // mode matches the resolution, or the display is an internal display.
 ASH_EXPORT bool GetDisplayModeForResolution(const DisplayInfo& info,
                                             const gfx::Size& resolution,
                                             DisplayMode* out);
 
 // Gets the display mode for the next valid UI scale. Returns false
 // if the display is not an internal display.
 ASH_EXPORT bool GetDisplayModeForNextUIScale(const DisplayInfo& info,
@@ skipping 36 matching lines @@
 
 // Returns the index in the displays whose bounds contains |point_in_screen|.
 // Returns -1 if no such display exist.
 ASH_EXPORT int FindDisplayIndexContainingPoint(
     const std::vector<gfx::Display>& displays,
     const gfx::Point& point_in_screen);
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_UTIL_H_