chromeos/display/real_output_configurator_delegate.cc - Issue 23880006: gtk: Allow building both the X11 and Gtk message-pumps for gtk.

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

Issue 23880006: gtk: Allow building both the X11 and Gtk message-pumps for gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tot-merge 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: chromeos/display/real_output_configurator_delegate.cc

diff --git a/chromeos/display/real_output_configurator_delegate.cc b/chromeos/display/real_output_configurator_delegate.cc

index 6d0c78254112c5e678f0149aefc181cb6ebd448e..2788bd332addd6381addca2f8bd5ee0e71ad642f 100644

--- a/chromeos/display/real_output_configurator_delegate.cc

+++ b/chromeos/display/real_output_configurator_delegate.cc

@@ -16,7 +16,7 @@

#include <utility>

#include "base/logging.h"

-#include "base/message_loop/message_pump_aurax11.h"

+#include "base/message_loop/message_pump_x11.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

#include "chromeos/display/output_util.h"

@@ -41,7 +41,7 @@ RRMode GetOutputNativeMode(const XRROutputInfo* output_info) {

} // namespace

RealOutputConfiguratorDelegate::RealOutputConfiguratorDelegate()

- : display_(base::MessagePumpAuraX11::GetDefaultXDisplay()),

+ : display_(base::MessagePumpX11::GetDefaultXDisplay()),

window_(DefaultRootWindow(display_)),

screen_(NULL),

is_panel_fitting_enabled_(false) {

« no previous file with comments | « chromeos/display/output_util.cc ('k') | content/browser/power_save_blocker_x11.cc » ('j') | no next file with comments »