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

Unified Diff: ui/aura/desktop.h

Issue 8635014: DefaultDispatcher for MessagePumpX (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DeleteInstanceForTesting->DeleteInstance Created 9 years, 1 month 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 | « base/message_pump_x.cc ('k') | ui/aura/desktop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop.h
diff --git a/ui/aura/desktop.h b/ui/aura/desktop.h
index 40963f4de36c1445adf174a11e9807769acaaf65..633c970299dbf741ffec7b8fee400e90ba549c9f 100644
--- a/ui/aura/desktop.h
+++ b/ui/aura/desktop.h
@@ -46,11 +46,8 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
public internal::FocusManager,
public ui::LayerAnimationObserver {
public:
- Desktop();
- virtual ~Desktop();
-
static Desktop* GetInstance();
- static void DeleteInstanceForTesting();
+ static void DeleteInstance();
static void set_use_fullscreen_host_window(bool use_fullscreen) {
use_fullscreen_host_window_ = use_fullscreen;
@@ -151,6 +148,9 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
#endif
private:
+ Desktop();
+ virtual ~Desktop();
+
// Called whenever the mouse moves, tracks the current |mouse_moved_handler_|,
// sending exited and entered events as its value changes.
void HandleMouseMoved(const MouseEvent& event, Window* target);
« no previous file with comments | « base/message_pump_x.cc ('k') | ui/aura/desktop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698