trunk/src/chromeos/display/real_output_configurator_delegate.cc - Issue 24365012: Revert 225054 "linux_aura: Implement most of DesktopScreenX11."

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: trunk/src/chromeos/display/real_output_configurator_delegate.cc

Issue 24365012: Revert 225054 "linux_aura: Implement most of DesktopScreenX11." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 3 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: trunk/src/chromeos/display/real_output_configurator_delegate.cc

===================================================================

--- trunk/src/chromeos/display/real_output_configurator_delegate.cc (revision 225060)

+++ trunk/src/chromeos/display/real_output_configurator_delegate.cc (working copy)

@@ -17,7 +17,6 @@

#include "base/logging.h"

#include "base/message_loop/message_pump_x11.h"

-#include "base/x11/edid_parser_x11.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

#include "chromeos/display/output_util.h"

@@ -264,7 +263,7 @@

output.output = id;

output.width_mm = info->mm_width;

output.height_mm = info->mm_height;

- output.has_display_id = base::GetDisplayId(id, index, &output.display_id);

+ output.has_display_id = GetDisplayId(id, index, &output.display_id);

output.is_internal = IsInternalOutput(info);

output.index = index;

« no previous file with comments | « trunk/src/chromeos/display/output_util_unittest.cc ('k') | trunk/src/ui/views/views.gyp » ('j') | no next file with comments »