content/browser/power_save_blocker_linux.cc - Issue 10441028: aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it.

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: content/browser/power_save_blocker_linux.cc

Issue 10441028: aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix compile error in file added in the interim Created 8 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/system_key_event_listener.cc ('k') | content/common/gpu/media/gles2_texture_to_egl_image_translator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/power_save_blocker_linux.cc

diff --git a/content/browser/power_save_blocker_linux.cc b/content/browser/power_save_blocker_linux.cc

index b0c3ae072779f4e62b406923d0bfe79c511c0c8d..776e0a658989918febce7b9438c51d31b4c24cca 100644

--- a/content/browser/power_save_blocker_linux.cc

+++ b/content/browser/power_save_blocker_linux.cc

@@ -25,7 +25,7 @@

#if defined(TOOLKIT_GTK)

#include "base/message_pump_gtk.h"

#else

-#include "base/message_pump_x.h"

+#include "base/message_pump_aurax11.h"

#endif

#include "base/nix/xdg_util.h"

#include "content/public/browser/browser_thread.h"

@@ -481,11 +481,7 @@ DBusPowerSaveBlocker::~DBusPowerSaveBlocker() {

// static

bool DBusPowerSaveBlocker::DPMSEnabled() {

-#if defined(TOOLKIT_GTK)

- Display* display = base::MessagePumpGtk::GetDefaultXDisplay();

-#else

- Display* display = base::MessagePumpX::GetDefaultXDisplay();

-#endif

+ Display* display = base::MessagePumpForUI::GetDefaultXDisplay();

BOOL enabled = false;

int dummy;

if (DPMSQueryExtension(display, &dummy, &dummy) && DPMSCapable(display)) {