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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 #include "third_party/skia/include/core/SkColor.h" | 48 #include "third_party/skia/include/core/SkColor.h" |
49 #import "ui/base/cocoa/fullscreen_window_manager.h" | 49 #import "ui/base/cocoa/fullscreen_window_manager.h" |
50 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" | 50 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" |
51 #include "ui/gfx/point.h" | 51 #include "ui/gfx/point.h" |
52 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 52 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
53 #include "ui/surface/io_surface_support_mac.h" | 53 #include "ui/surface/io_surface_support_mac.h" |
54 #include "webkit/glue/webaccessibility.h" | 54 #include "webkit/glue/webaccessibility.h" |
55 #include "webkit/plugins/npapi/webplugin.h" | 55 #include "webkit/plugins/npapi/webplugin.h" |
56 | 56 |
57 using content::BrowserThread; | 57 using content::BrowserThread; |
| 58 using content::NativeWebKeyboardEvent; |
58 using content::RenderViewHostImpl; | 59 using content::RenderViewHostImpl; |
59 using content::RenderWidgetHost; | 60 using content::RenderWidgetHost; |
60 using content::RenderWidgetHostImpl; | 61 using content::RenderWidgetHostImpl; |
61 using content::RenderWidgetHostView; | 62 using content::RenderWidgetHostView; |
62 using WebKit::WebInputEvent; | 63 using WebKit::WebInputEvent; |
63 using WebKit::WebInputEventFactory; | 64 using WebKit::WebInputEventFactory; |
64 using WebKit::WebMouseEvent; | 65 using WebKit::WebMouseEvent; |
65 using WebKit::WebMouseWheelEvent; | 66 using WebKit::WebMouseWheelEvent; |
66 using WebKit::WebGestureEvent; | 67 using WebKit::WebGestureEvent; |
67 | 68 |
(...skipping 2825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2893 if (!string) return NO; | 2894 if (!string) return NO; |
2894 | 2895 |
2895 // If the user is currently using an IME, confirm the IME input, | 2896 // If the user is currently using an IME, confirm the IME input, |
2896 // and then insert the text from the service, the same as TextEdit and Safari. | 2897 // and then insert the text from the service, the same as TextEdit and Safari. |
2897 [self confirmComposition]; | 2898 [self confirmComposition]; |
2898 [self insertText:string]; | 2899 [self insertText:string]; |
2899 return YES; | 2900 return YES; |
2900 } | 2901 } |
2901 | 2902 |
2902 @end | 2903 @end |
OLD | NEW |