Index: ui/aura/desktop.h |
=================================================================== |
--- ui/aura/desktop.h (revision 113258) |
+++ ui/aura/desktop.h (working copy) |
@@ -26,17 +26,12 @@ |
} |
namespace ui { |
-class InputMethod; |
class LayerAnimationSequence; |
class Transform; |
} |
namespace aura { |
-namespace test { |
-class DesktopHostIMETest; |
-} // namespace test |
- |
class DesktopHost; |
class DesktopObserver; |
class KeyEvent; |
@@ -150,9 +145,6 @@ |
// 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(); |
@@ -162,8 +154,6 @@ |
virtual void ScheduleDraw(); |
private: |
- friend class aura::test::DesktopHostIMETest; // need to access |host_|. |
- |
Desktop(); |
virtual ~Desktop(); |