Revert 243777 "Moves CandidateWindow model to ui/base/ime."

trunk/src/ui/base/ime/chromeos/ibus_bridge.h

 // Copyright 2013 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.
 // TODO(nona): Rename this file to ime_bridge.h
 
 #ifndef UI_BASE_IME_CHROMEOS_IBUS_BRIDGE_H_
 #define UI_BASE_IME_CHROMEOS_IBUS_BRIDGE_H_
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/ui_base_export.h"
 
 namespace gfx {
 class Rect;
 }  // namespace gfx
 
 namespace ui {
-class CandidateWindow;
 class KeyEvent;
 }  // namespace ui
 
 namespace chromeos {
+namespace input_method {
+class CandidateWindow;
+}  // namespace input_method
 
 class IBusText;
 
 class UI_BASE_EXPORT IBusInputContextHandlerInterface {
  public:
   // Called when the engine commit a text.
   virtual void CommitText(const std::string& text) = 0;
 
   // Called when the engine update preedit stroing.
   virtual void UpdatePreeditText(const IBusText& text,
@@ skipping 66 matching lines @@
  protected:
   IBusEngineHandlerInterface() {}
 };
 
 // A interface to handle the candidate window related method call.
 class UI_BASE_EXPORT IBusPanelCandidateWindowHandlerInterface {
  public:
   virtual ~IBusPanelCandidateWindowHandlerInterface() {}
 
   // Called when the IME updates the lookup table.
-  virtual void UpdateLookupTable(const ui::CandidateWindow& candidate_window,
-                                 bool visible) = 0;
+  virtual void UpdateLookupTable(
+      const input_method::CandidateWindow& candidate_window,
+      bool visible) = 0;
 
   // Called when the IME updates the preedit text. The |text| is given in
   // UTF-8 encoding.
   virtual void UpdatePreeditText(const std::string& text, uint32 cursor_pos,
                                  bool visible) = 0;
 
   // Called when the application changes its caret bounds.
   virtual void SetCursorBounds(const gfx::Rect& cursor_bounds,
                                const gfx::Rect& composition_head) = 0;
 
@@ skipping 68 matching lines @@
  protected:
   IBusBridge();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IBusBridge);
 };
 
 }  // namespace chromeos
 
 #endif  // UI_BASE_IME_CHROMEOS_IBUS_BRIDGE_H_