MacViews: Implement text input.

ui/views/cocoa/bridged_native_widget.mm

 // Copyright 2014 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.
 
 #import "ui/views/cocoa/bridged_native_widget.h"
 
 #include "base/logging.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/base/ui_base_switches_util.h"
 #import "ui/views/cocoa/bridged_content_view.h"
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 #include "ui/views/ime/input_method_bridge.h"
 #include "ui/views/ime/null_input_method.h"
 #include "ui/views/view.h"
+#include "ui/views/widget/native_widget_mac.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 BridgedNativeWidget::BridgedNativeWidget(NativeWidgetMac* parent)
     : native_widget_mac_(parent) {
   window_delegate_.reset(
       [[ViewsNSWindowDelegate alloc] initWithBridgedNativeWidget:this]);
+  focus_manager_ = parent ? parent->GetWidget()->GetFocusManager() : NULL;
+  if (focus_manager_)
+    focus_manager_->AddFocusChangeListener(this);
 }
 
 BridgedNativeWidget::~BridgedNativeWidget() {
+  if (focus_manager_)
+    focus_manager_->RemoveFocusChangeListener(this);
   SetRootView(NULL);
   [window_ setDelegate:nil];
 }
 
 void BridgedNativeWidget::Init(base::scoped_nsobject<NSWindow> window) {
   DCHECK(!window_);
   window_.swap(window);
   [window_ setDelegate:window_delegate_];
 }
 
@@ skipping 31 matching lines @@
   }
   return input_method_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, internal::InputMethodDelegate:
 
 void BridgedNativeWidget::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
   // Mac key events don't go through this, but some unit tests that use
   // MockInputMethod do.
   Widget* widget = [bridged_view_ hostedView]->GetWidget();

[tapted, 2014/06/20 00:40:59]

I'd probably do

DCHECK(parent_);
DCHECK(focus_manager_);
parent_->GetWidget()->OnKeyEvent(const_cast<ui::KeyEvent*>(&key));
if (!key.handled())
  focus_manager_->OnKeyEvent(key);

(i.e. if a test calls this, it's not a great test if that stuff is missing, and
would probably crash when bridged_view_ is nil anyway and [.. hostedView] return
NULL.. although it's possible there's a test "somewhere" that relies on this
codepath too).

[Andre, 2014/06/20 01:00:39]

Done.

   widget->OnKeyEvent(const_cast<ui::KeyEvent*>(&key));
-  if (!key.handled() && widget->GetFocusManager())
-    widget->GetFocusManager()->OnKeyEvent(key);
+  if (!key.handled() && focus_manager_)
+    focus_manager_->OnKeyEvent(key);
+}
+
+void BridgedNativeWidget::OnWillChangeFocus(View* focused_before,
+                                            View* focused_now) {
+}
+
+void BridgedNativeWidget::OnDidChangeFocus(View* focused_before,
+                                           View* focused_now) {
+  ui::TextInputClient* input_client =
+      focused_now ? focused_now->GetTextInputClient() : NULL;
+  [bridged_view_ setTextInputClient:input_client];
 }
 
 }  // namespace views