| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
| 6 | 6 |
| 7 #include <QuartzCore/QuartzCore.h> | 7 #include <QuartzCore/QuartzCore.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" | 50 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" |
| 51 #include "ui/base/layout.h" | 51 #include "ui/base/layout.h" |
| 52 #include "ui/gfx/point.h" | 52 #include "ui/gfx/point.h" |
| 53 #include "ui/gfx/rect_conversions.h" | 53 #include "ui/gfx/rect_conversions.h" |
| 54 #include "ui/gfx/size_conversions.h" | 54 #include "ui/gfx/size_conversions.h" |
| 55 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 55 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
| 56 #include "ui/surface/io_surface_support_mac.h" | 56 #include "ui/surface/io_surface_support_mac.h" |
| 57 #include "webkit/plugins/npapi/webplugin.h" | 57 #include "webkit/plugins/npapi/webplugin.h" |
| 58 | 58 |
| 59 using content::BackingStoreMac; | 59 using content::BackingStoreMac; |
| 60 using content::EditCommand; |
| 60 using content::NativeWebKeyboardEvent; | 61 using content::NativeWebKeyboardEvent; |
| 61 using content::RenderViewHostImpl; | 62 using content::RenderViewHostImpl; |
| 62 using content::RenderWidgetHostImpl; | 63 using content::RenderWidgetHostImpl; |
| 63 using content::RenderWidgetHostViewMac; | 64 using content::RenderWidgetHostViewMac; |
| 64 using content::RenderWidgetHostViewMacEditCommandHelper; | 65 using content::RenderWidgetHostViewMacEditCommandHelper; |
| 65 using WebKit::WebInputEvent; | 66 using WebKit::WebInputEvent; |
| 66 using WebKit::WebInputEventFactory; | 67 using WebKit::WebInputEventFactory; |
| 67 using WebKit::WebMouseEvent; | 68 using WebKit::WebMouseEvent; |
| 68 using WebKit::WebMouseWheelEvent; | 69 using WebKit::WebMouseWheelEvent; |
| 69 using WebKit::WebGestureEvent; | 70 using WebKit::WebGestureEvent; |
| (...skipping 3227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3297 if (!string) return NO; | 3298 if (!string) return NO; |
| 3298 | 3299 |
| 3299 // If the user is currently using an IME, confirm the IME input, | 3300 // If the user is currently using an IME, confirm the IME input, |
| 3300 // and then insert the text from the service, the same as TextEdit and Safari. | 3301 // and then insert the text from the service, the same as TextEdit and Safari. |
| 3301 [self confirmComposition]; | 3302 [self confirmComposition]; |
| 3302 [self insertText:string]; | 3303 [self insertText:string]; |
| 3303 return YES; | 3304 return YES; |
| 3304 } | 3305 } |
| 3305 | 3306 |
| 3306 @end | 3307 @end |
| OLD | NEW |