| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <QuartzCore/QuartzCore.h> | 5 #include <QuartzCore/QuartzCore.h> |
| 6 | 6 |
| 7 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" | 7 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" |
| 8 | 8 |
| 9 #include "app/app_switches.h" | 9 #include "app/app_switches.h" |
| 10 #include "app/surface/io_surface_support_mac.h" | 10 #include "app/surface/io_surface_support_mac.h" |
| 11 #import "base/chrome_application_mac.h" | |
| 12 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 13 #include "base/logging.h" | 12 #include "base/logging.h" |
| 14 #include "base/mac/scoped_cftyperef.h" | 13 #include "base/mac/scoped_cftyperef.h" |
| 15 #import "base/mac/scoped_nsautorelease_pool.h" | 14 #import "base/mac/scoped_nsautorelease_pool.h" |
| 16 #include "base/metrics/histogram.h" | 15 #include "base/metrics/histogram.h" |
| 17 #import "base/scoped_nsobject.h" | 16 #import "base/scoped_nsobject.h" |
| 18 #include "base/string_util.h" | 17 #include "base/string_util.h" |
| 19 #include "base/sys_info.h" | 18 #include "base/sys_info.h" |
| 20 #include "base/sys_string_conversions.h" | 19 #include "base/sys_string_conversions.h" |
| 21 #import "chrome/browser/accessibility/browser_accessibility_cocoa.h" | 20 #import "chrome/browser/accessibility/browser_accessibility_cocoa.h" |
| (...skipping 2658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2680 if (!string) return NO; | 2679 if (!string) return NO; |
| 2681 | 2680 |
| 2682 // If the user is currently using an IME, confirm the IME input, | 2681 // If the user is currently using an IME, confirm the IME input, |
| 2683 // and then insert the text from the service, the same as TextEdit and Safari. | 2682 // and then insert the text from the service, the same as TextEdit and Safari. |
| 2684 [self confirmComposition]; | 2683 [self confirmComposition]; |
| 2685 [self insertText:string]; | 2684 [self insertText:string]; |
| 2686 return YES; | 2685 return YES; |
| 2687 } | 2686 } |
| 2688 | 2687 |
| 2689 @end | 2688 @end |
| OLD | NEW |