| Index: ui/aura/desktop.h
|
| diff --git a/ui/aura/desktop.h b/ui/aura/desktop.h
|
| index df12a6cd4f21008e2c2c97eac5f88adb0fdad228..d76e43eefdf1743fb7fd2b4973e5452eeacde888 100644
|
| --- a/ui/aura/desktop.h
|
| +++ b/ui/aura/desktop.h
|
| @@ -150,6 +150,9 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
|
| void ToggleFullScreen();
|
| #endif
|
|
|
| + // Overridden from ui::CompositorDelegate:
|
| + virtual void ScheduleDraw();
|
| +
|
| private:
|
| Desktop();
|
| virtual ~Desktop();
|
| @@ -162,9 +165,6 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
|
| bool ProcessKeyEvent(Window* target, KeyEvent* event);
|
| ui::TouchStatus ProcessTouchEvent(Window* target, TouchEvent* event);
|
|
|
| - // Overridden from ui::CompositorDelegate
|
| - virtual void ScheduleDraw();
|
| -
|
| // Overridden from Window:
|
| virtual bool CanFocus() const OVERRIDE;
|
| virtual internal::FocusManager* GetFocusManager() OVERRIDE;
|
|
|