Redesigns the text input focus handling.

ui/views/focus/focus_manager.h

 // Copyright (c) 2012 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_FOCUS_FOCUS_MANAGER_H_
 #define UI_VIEWS_FOCUS_FOCUS_MANAGER_H_
 
 #include <list>
 #include <map>
 
@@ skipping 54 matching lines @@
 //   when traversing up from the nested RootView to know which view to start
 //   with when going to the next/previous view.
 //   In our example:
 //   hwnd_view_container_->GetWidget()->SetFocusTraversableParent(
 //      native_control);
 //
 // Note that FocusTraversable do not have to be RootViews: AccessibleToolbarView
 // is FocusTraversable.
 
 namespace ui {
+class AcceleratorManager;
 class AcceleratorTarget;
-class AcceleratorManager;
 class EventHandler;
 class KeyEvent;
 }
 
 namespace views {
 
 class FocusManagerDelegate;
 class FocusSearch;
 class RootView;
 class View;
@@ skipping 62 matching lines @@
   };
 
   FocusManager(Widget* widget, FocusManagerDelegate* delegate);
   virtual ~FocusManager();
 
   // Processes the passed key event for accelerators and keyboard traversal.
   // Returns false if the event has been consumed and should not be processed
   // further.
   bool OnKeyEvent(const ui::KeyEvent& event);
 
+  // Changes the text input focus to |view->GetTextInputClient()| iff |view|
+  // is focused.  Views must call this method when their internal
+  // TextInputClient instance changes.
+  void OnTextInputClientChanged(View* view);
+
   // Returns true is the specified is part of the hierarchy of the window
   // associated with this FocusManager.
   bool ContainsView(View* view);
 
   // Advances the focus (backward if reverse is true).
   void AdvanceFocus(bool reverse);
 
   // The FocusManager keeps track of the focused view within a RootView.
   View* GetFocusedView() { return focused_view_; }
   const View* GetFocusedView() const { return focused_view_; }
@@ skipping 37 matching lines @@
   // Returns the View that either currently has focus, or if no view has focus
   // the view that last had focus.
   View* GetStoredFocusView();
 
   // Clears the stored focused view.
   void ClearStoredFocusedView();
 
   // Returns true if in the process of changing the focused view.
   bool is_changing_focus() const { return is_changing_focus_; }
 
+  // Moves the text input focus into/out from |view|.

[msw, 2014/03/12 20:56:15]

nit: now that these are public, group them with OnTextInputClientChanged

[Yuki, 2014/03/14 15:25:22]

Done.

+  void FocusTextInputClient(View* view);
+  void BlurTextInputClient(View* view);
+
   // Disable shortcut handling.
   static void set_shortcut_handling_suspended(bool suspended) {
     shortcut_handling_suspended_ = suspended;
   }
   // Returns whether shortcut handling is currently suspended.
   bool shortcut_handling_suspended() { return shortcut_handling_suspended_; }
 
   // Register a keyboard accelerator for the specified target. If multiple
   // targets are registered for an accelerator, a target registered later has
   // higher priority.
@@ skipping 137 matching lines @@
 
   // See description above getter.
   bool is_changing_focus_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusManager);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_FOCUS_FOCUS_MANAGER_H_