ui/aura/env.cc - Issue 110283005: Make aura_demo work on Mac

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: ui/aura/env.cc

Issue 110283005: Make aura_demo work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix resolve Created 6 years, 11 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: ui/aura/env.cc

diff --git a/ui/aura/env.cc b/ui/aura/env.cc

index 0982d91ad265ca72a887bf2065eb7c1a3ba932be..4640b8559f68c5b2b4868cebfbaec452cc3f5859 100644

--- a/ui/aura/env.cc

+++ b/ui/aura/env.cc

@@ -5,6 +5,7 @@

#include "ui/aura/env.h"

#include "base/command_line.h"

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

#include "ui/aura/env_observer.h"

#include "ui/aura/input_state_lookup.h"

#include "ui/aura/window.h"

@@ -75,8 +76,6 @@ bool Env::IsMouseButtonDown() const {

mouse_button_flags_ != 0;

}

-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \

- !defined(USE_GTK_MESSAGE_PUMP)

base::MessageLoop::Dispatcher* Env::GetDispatcher() {

#if defined(USE_X11)

return base::MessagePumpX11::Current();

@@ -84,7 +83,6 @@ base::MessageLoop::Dispatcher* Env::GetDispatcher() {

return dispatcher_.get();

#endif

}

-#endif

void Env::RootWindowActivated(RootWindow* root_window) {

FOR_EACH_OBSERVER(EnvObserver, observers_,

« no previous file with comments | « ui/aura/env.h ('k') | ui/aura/root_window_host_mac.h » ('j') | no next file with comments »