| Index: ui/aura/desktop.h
|
| diff --git a/ui/aura/desktop.h b/ui/aura/desktop.h
|
| index df12a6cd4f21008e2c2c97eac5f88adb0fdad228..181a80015f5f7e8118514050c11016bbdfb25ae9 100644
|
| --- a/ui/aura/desktop.h
|
| +++ b/ui/aura/desktop.h
|
| @@ -26,12 +26,17 @@ class Size;
|
| }
|
|
|
| namespace ui {
|
| +class InputMethod;
|
| class LayerAnimationSequence;
|
| class Transform;
|
| }
|
|
|
| namespace aura {
|
|
|
| +namespace test {
|
| +class DesktopHostIMETest;
|
| +} // namespace test
|
| +
|
| class DesktopHost;
|
| class DesktopObserver;
|
| class KeyEvent;
|
| @@ -145,12 +150,17 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
|
| // Overridden from Window:
|
| virtual void SetTransform(const ui::Transform& transform) OVERRIDE;
|
|
|
| + // Gets the input method for the desktop.
|
| + ui::InputMethod* GetInputMethod();
|
| +
|
| #if !defined(NDEBUG)
|
| // Toggles the host's full screen state.
|
| void ToggleFullScreen();
|
| #endif
|
|
|
| private:
|
| + friend class aura::test::DesktopHostIMETest; // need to access |host_|.
|
| +
|
| Desktop();
|
| virtual ~Desktop();
|
|
|
|
|