Revert 219673 "Fix Views Combobox and Tree View text input."

trunk/src/ui/views/ime/input_method_base.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_VIEWS_IME_INPUT_METHOD_BASE_H_
 #define UI_VIEWS_IME_INPUT_METHOD_BASE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/views/focus/focus_manager.h"
@@ skipping 23 matching lines @@
   virtual void OnTextInputTypeChanged(View* view) OVERRIDE;
   virtual ui::TextInputClient* GetTextInputClient() const OVERRIDE;
   virtual ui::TextInputType GetTextInputType() const OVERRIDE;
   virtual bool IsMock() const OVERRIDE;
 
   // Overridden from FocusChangeListener.
   virtual void OnWillChangeFocus(View* focused_before, View* focused) OVERRIDE;
   virtual void OnDidChangeFocus(View* focused_before, View* focused) OVERRIDE;
 
  protected:
-  // Return the widget's focused view.
+  internal::InputMethodDelegate* delegate() const { return delegate_; }
+  Widget* widget() const { return widget_; }
   View* GetFocusedView() const;
 
   // Returns true only if the View is focused and its Widget is active.
   bool IsViewFocused(View* view) const;
 
   // Returns true if there is no focused text input client or its type is none.
   bool IsTextInputTypeNone() const;
 
   // Calls the focused text input client's OnInputMethodChanged() method.
   // This has no effect if the text input type is ui::TEXT_INPUT_TYPE_NONE.
@@ skipping 14 matching lines @@
  private:
   internal::InputMethodDelegate* delegate_;
   Widget* widget_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodBase);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_IME_INPUT_METHOD_BASE_H_