ash/system/chromeos/tray_display.cc - Issue 1126933004: Allow switching between extended and unified

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/system/chromeos/tray_display.cc

Issue 1126933004: Allow switching between extended and unified (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: added div for class=checkbox, with controlled-setting-with-label + inline-block Created 5 years, 7 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/system/chromeos/tray_display.cc

diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc

index 7074c58343489ffcc143f38ae61c17b717432cb6..a5907f9a323c5f377aa4c0f4fcb50528323a81f1 100644

--- a/ash/system/chromeos/tray_display.cc

+++ b/ash/system/chromeos/tray_display.cc

@@ -92,7 +92,8 @@ base::string16 GetAllDisplayInfo() {

std::vector<base::string16> lines;

int64 internal_id = gfx::Display::kInvalidDisplayID;

// Make sure to show the internal display first.

- if (gfx::Display::HasInternalDisplay() &&

+ if (!display_manager->IsInUnifiedMode() &&

+ gfx::Display::HasInternalDisplay() &&

gfx::Display::InternalDisplayId() ==

display_manager->first_display_id()) {

internal_id = display_manager->first_display_id();