Fixes for views_unittests on Mac after InputMethodBridge removal (DO NOT COMMIT)

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"
 
 #import <objc/runtime.h>
 
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
@@ skipping 689 matching lines @@
   bool shows_fullscreen_controls =
       is_resizable && widget->widget_delegate()->CanMaximize();
 
   gfx::ApplyNSWindowSizeConstraints(window_, min_size, max_size,
                                     shows_resize_controls,
                                     shows_fullscreen_controls);
 }
 
 ui::InputMethod* BridgedNativeWidget::GetInputMethod() {
   if (!input_method_) {
-    // Delegate is NULL because Mac IME does not need DispatchKeyEventPostIME

[tapted, 2015/06/25 11:54:14]

I think this was true (and worked OK) when InputMethodBridge was calling
DispatchKeyEventPostIME, but now that InputMethod calls it, the delegate is
needed.

-    // callbacks.
-    input_method_ = ui::CreateInputMethod(NULL, nil);
+    input_method_ = ui::CreateInputMethod(this, nil);
     input_method_->OnFocus();
   }
   return input_method_.get();
 }
 
 gfx::Rect BridgedNativeWidget::GetRestoredBounds() const {
   if (target_fullscreen_state_ || in_fullscreen_transition_)
     return bounds_before_fullscreen_;
 
   return gfx::ScreenRectFromNSRect([window_ frame]);
@@ skipping 20 matching lines @@
   layer()->SetFillsBoundsOpaquely(!translucent);
   if (translucent) {
     [window_ setOpaque:NO];
     [window_ setBackgroundColor:[NSColor clearColor]];
   }
 
   UpdateLayerProperties();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// BridgedNativeWidget, internal::InputMethodDelegate:
+
+bool BridgedNativeWidget::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
+  DCHECK(focus_manager_);
+  native_widget_mac_->GetWidget()->OnKeyEvent(const_cast<ui::KeyEvent*>(&key));
+  if (!key.handled())
+    focus_manager_->OnKeyEvent(key);
+  return key.handled();
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, CocoaMouseCaptureDelegate:
 
 void BridgedNativeWidget::PostCapturedEvent(NSEvent* event) {
   [bridged_view_ processCapturedMouseEvent:event];
 }
 
 void BridgedNativeWidget::OnMouseCaptureLost() {
   native_widget_mac_->GetWidget()->OnMouseCaptureLost();
 }
 
@@ skipping 250 matching lines @@
   [bridged_view_ setMouseDownCanMoveWindow:draggable];
   // AppKit will not update its cache of mouseDownCanMoveWindow unless something
   // changes. Previously we tried adding an NSView and removing it, but for some
   // reason it required reposting the mouse-down event, and didn't always work.
   // Calling the below seems to be an effective solution.
   [window_ setMovableByWindowBackground:NO];
   [window_ setMovableByWindowBackground:YES];
 }
 
 }  // namespace views