Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: trunk/src/ui/aura/env.h

Issue 138433008: Revert 245226 "Nukes MessageLoop::Dispatcher" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ui/aura/dispatcher_win.cc ('k') | trunk/src/ui/aura/env.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/aura/env.h
===================================================================
--- trunk/src/ui/aura/env.h (revision 245238)
+++ trunk/src/ui/aura/env.h (working copy)
@@ -6,7 +6,7 @@
#define UI_AURA_ENV_H_
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_pump_dispatcher.h"
+#include "base/message_loop/message_loop.h"
#include "base/observer_list.h"
#include "ui/aura/aura_export.h"
#include "ui/events/event_handler.h"
@@ -29,7 +29,7 @@
class Window;
// Creates a platform-specific native event dispatcher.
-base::MessagePumpDispatcher* CreateDispatcher();
+base::MessageLoop::Dispatcher* CreateDispatcher();
// A singleton object that tracks general state within Aura.
// TODO(beng): manage RootWindows.
@@ -66,7 +66,7 @@
// Returns the native event dispatcher. The result should only be passed to
// base::RunLoop(dispatcher), or used to dispatch an event by
// |Dispatch(const NativeEvent&)| on it. It must never be stored.
- base::MessagePumpDispatcher* GetDispatcher();
+ base::MessageLoop::Dispatcher* GetDispatcher();
// Invoked by RootWindow when its host is activated.
void RootWindowActivated(RootWindow* root_window);
@@ -91,7 +91,7 @@
virtual ui::EventTargeter* GetEventTargeter() OVERRIDE;
ObserverList<EnvObserver> observers_;
- scoped_ptr<base::MessagePumpDispatcher> dispatcher_;
+ scoped_ptr<base::MessageLoop::Dispatcher> dispatcher_;
static Env* instance_;
int mouse_button_flags_;
« no previous file with comments | « trunk/src/ui/aura/dispatcher_win.cc ('k') | trunk/src/ui/aura/env.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698