| 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/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" | 43 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" |
| 44 #import "third_party/mozilla/ComplexTextInputPanel.h" | 44 #import "third_party/mozilla/ComplexTextInputPanel.h" |
| 45 #include "third_party/skia/include/core/SkColor.h" | 45 #include "third_party/skia/include/core/SkColor.h" |
| 46 #include "ui/gfx/point.h" | 46 #include "ui/gfx/point.h" |
| 47 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 47 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
| 48 #include "ui/gfx/surface/io_surface_support_mac.h" | 48 #include "ui/gfx/surface/io_surface_support_mac.h" |
| 49 #include "webkit/glue/webaccessibility.h" | 49 #include "webkit/glue/webaccessibility.h" |
| 50 #include "webkit/plugins/npapi/webplugin.h" | 50 #include "webkit/plugins/npapi/webplugin.h" |
| 51 | 51 |
| 52 using content::BrowserThread; | 52 using content::BrowserThread; |
| 53 using content::RenderWidgetHostView; |
| 53 using WebKit::WebInputEvent; | 54 using WebKit::WebInputEvent; |
| 54 using WebKit::WebInputEventFactory; | 55 using WebKit::WebInputEventFactory; |
| 55 using WebKit::WebMouseEvent; | 56 using WebKit::WebMouseEvent; |
| 56 using WebKit::WebMouseWheelEvent; | 57 using WebKit::WebMouseWheelEvent; |
| 57 using WebKit::WebGestureEvent; | 58 using WebKit::WebGestureEvent; |
| 58 | 59 |
| 59 // Declare things that are part of the 10.6 SDK. | 60 // Declare things that are part of the 10.6 SDK. |
| 60 #if !defined(MAC_OS_X_VERSION_10_6) || \ | 61 #if !defined(MAC_OS_X_VERSION_10_6) || \ |
| 61 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | 62 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 |
| 62 enum { | 63 enum { |
| (...skipping 2700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2763 if (!string) return NO; | 2764 if (!string) return NO; |
| 2764 | 2765 |
| 2765 // If the user is currently using an IME, confirm the IME input, | 2766 // If the user is currently using an IME, confirm the IME input, |
| 2766 // and then insert the text from the service, the same as TextEdit and Safari. | 2767 // and then insert the text from the service, the same as TextEdit and Safari. |
| 2767 [self confirmComposition]; | 2768 [self confirmComposition]; |
| 2768 [self insertText:string]; | 2769 [self insertText:string]; |
| 2769 return YES; | 2770 return YES; |
| 2770 } | 2771 } |
| 2771 | 2772 |
| 2772 @end | 2773 @end |
| OLD | NEW |