| 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 15 matching lines...) Expand all Loading... |
| 26 #include "content/browser/renderer_host/backing_store_mac.h" | 26 #include "content/browser/renderer_host/backing_store_mac.h" |
| 27 #include "content/browser/renderer_host/backing_store_manager.h" | 27 #include "content/browser/renderer_host/backing_store_manager.h" |
| 28 #include "content/browser/renderer_host/compositing_iosurface_mac.h" | 28 #include "content/browser/renderer_host/compositing_iosurface_mac.h" |
| 29 #include "content/browser/renderer_host/render_view_host_impl.h" | 29 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 30 #import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_h
elper.h" | 30 #import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_h
elper.h" |
| 31 #import "content/browser/renderer_host/text_input_client_mac.h" | 31 #import "content/browser/renderer_host/text_input_client_mac.h" |
| 32 #include "content/common/accessibility_messages.h" | 32 #include "content/common/accessibility_messages.h" |
| 33 #include "content/common/edit_command.h" | 33 #include "content/common/edit_command.h" |
| 34 #include "content/common/gpu/gpu_messages.h" | 34 #include "content/common/gpu/gpu_messages.h" |
| 35 #include "content/common/input_messages.h" | 35 #include "content/common/input_messages.h" |
| 36 #include "content/common/plugin_messages.h" | |
| 37 #include "content/common/view_messages.h" | 36 #include "content/common/view_messages.h" |
| 38 #include "content/port/browser/render_widget_host_view_frame_subscriber.h" | 37 #include "content/port/browser/render_widget_host_view_frame_subscriber.h" |
| 39 #include "content/public/browser/browser_thread.h" | 38 #include "content/public/browser/browser_thread.h" |
| 40 #include "content/public/browser/native_web_keyboard_event.h" | 39 #include "content/public/browser/native_web_keyboard_event.h" |
| 41 #import "content/public/browser/render_widget_host_view_mac_delegate.h" | 40 #import "content/public/browser/render_widget_host_view_mac_delegate.h" |
| 42 #include "skia/ext/platform_canvas.h" | 41 #include "skia/ext/platform_canvas.h" |
| 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
| 45 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact
ory.h" | 44 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact
ory.h" |
| 46 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" | 45 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" |
| (...skipping 3352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3399 if (!string) return NO; | 3398 if (!string) return NO; |
| 3400 | 3399 |
| 3401 // If the user is currently using an IME, confirm the IME input, | 3400 // If the user is currently using an IME, confirm the IME input, |
| 3402 // and then insert the text from the service, the same as TextEdit and Safari. | 3401 // and then insert the text from the service, the same as TextEdit and Safari. |
| 3403 [self confirmComposition]; | 3402 [self confirmComposition]; |
| 3404 [self insertText:string]; | 3403 [self insertText:string]; |
| 3405 return YES; | 3404 return YES; |
| 3406 } | 3405 } |
| 3407 | 3406 |
| 3408 @end | 3407 @end |
| OLD | NEW |