Revert 113224 - IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in u...

ui/aura/desktop.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_DESKTOP_H_
 #define UI_AURA_DESKTOP_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/cursor.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/window.h"
 #include "ui/base/events.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer_animation_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
-class InputMethod;
 class LayerAnimationSequence;
 class Transform;
 }
 
 namespace aura {
 
-namespace test {
-class DesktopHostIMETest;
-}  // namespace test
-
 class DesktopHost;
 class DesktopObserver;
 class KeyEvent;
 class MouseEvent;
 class ScreenAura;
 class StackingClient;
 class TouchEvent;
 
 // Desktop is responsible for hosting a set of windows.
 class AURA_EXPORT Desktop : public ui::CompositorDelegate,
@@ skipping 93 matching lines @@
 
   // Sets capture to the specified window.
   void SetCapture(Window* window);
 
   // If |window| has mouse capture, the current capture window is set to NULL.
   void ReleaseCapture(Window* window);
 
   // 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
 
   // Overridden from ui::CompositorDelegate:
   virtual void ScheduleDraw();
 
  private:
-  friend class aura::test::DesktopHostIMETest;  // need to access |host_|.
-
   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);
 
   bool ProcessMouseEvent(Window* target, MouseEvent* event);
   bool ProcessKeyEvent(Window* target, KeyEvent* event);
   ui::TouchStatus ProcessTouchEvent(Window* target, TouchEvent* event);
@@ skipping 67 matching lines @@
   Window* mouse_moved_handler_;
   Window* focused_window_;
   Window* touch_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(Desktop);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_DESKTOP_H_