| 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);
|
|
|