Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2339)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/display_util.h

Issue 1263853002: Unified Desktop: Support 2xDSF display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/display/display_manager.cc ('K') | « ash/display/display_manager_unittest.cc ('k') | ash/display/display_util.cc » ('j') | ash/display/unified_mouse_warp_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_util.h
diff --git a/ash/display/display_util.h b/ash/display/display_util.h
index 10b779074907e8be3b7edc19260975aaea48929d..9cd3208b82b6cbe37962f86b3f9f8951b8cfca70 100644
--- a/ash/display/display_util.h
+++ b/ash/display/display_util.h
@@ -6,6 +6,7 @@
#define ASH_DISPLAY_DISPLAY_UTIL_H_
#include <set>
+#include <utility>
#include <vector>
#include "ash/ash_export.h"
@@ -32,7 +33,7 @@ ASH_EXPORT std::vector<DisplayMode> CreateInternalDisplayModeList(
// 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/display/display_manager.cc ('K') | « ash/display/display_manager_unittest.cc ('k') | ash/display/display_util.cc » ('j') | ash/display/unified_mouse_warp_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698