ash/display/display_util.h - Issue 1263853002: Unified Desktop: Support 2xDSF display

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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.

« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/display_util.cc » ('j') | no next file with comments »