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/surface/io_surface_support_mac.h" | 9 #include "app/surface/io_surface_support_mac.h" |
10 #import "base/chrome_application_mac.h" | 10 #import "base/chrome_application_mac.h" |
11 #include "base/histogram.h" | 11 #include "base/histogram.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #import "base/scoped_nsobject.h" | 13 #import "base/scoped_nsobject.h" |
14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
15 #include "base/sys_string_conversions.h" | 15 #include "base/sys_string_conversions.h" |
16 #include "chrome/browser/browser_trial.h" | 16 #include "chrome/browser/browser_trial.h" |
17 #import "chrome/browser/cocoa/rwhvm_editcommand_helper.h" | 17 #import "chrome/browser/cocoa/rwhvm_editcommand_helper.h" |
| 18 #import "chrome/browser/cocoa/view_id_util.h" |
18 #include "chrome/browser/plugin_process_host.h" | 19 #include "chrome/browser/plugin_process_host.h" |
19 #include "chrome/browser/renderer_host/backing_store_mac.h" | 20 #include "chrome/browser/renderer_host/backing_store_mac.h" |
20 #include "chrome/browser/renderer_host/render_process_host.h" | 21 #include "chrome/browser/renderer_host/render_process_host.h" |
21 #include "chrome/browser/renderer_host/render_view_host.h" | 22 #include "chrome/browser/renderer_host/render_view_host.h" |
22 #include "chrome/browser/renderer_host/render_widget_host.h" | 23 #include "chrome/browser/renderer_host/render_widget_host.h" |
23 #include "chrome/browser/spellchecker_platform_engine.h" | 24 #include "chrome/browser/spellchecker_platform_engine.h" |
24 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/common/native_web_keyboard_event.h" | 26 #include "chrome/common/native_web_keyboard_event.h" |
26 #include "chrome/common/edit_command.h" | 27 #include "chrome/common/edit_command.h" |
27 #include "chrome/common/plugin_messages.h" | 28 #include "chrome/common/plugin_messages.h" |
(...skipping 2069 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2097 - (void)confirmComposition { | 2098 - (void)confirmComposition { |
2098 if (!hasMarkedText_) | 2099 if (!hasMarkedText_) |
2099 return; | 2100 return; |
2100 | 2101 |
2101 if (renderWidgetHostView_->render_widget_host_) | 2102 if (renderWidgetHostView_->render_widget_host_) |
2102 renderWidgetHostView_->render_widget_host_->ImeConfirmComposition(); | 2103 renderWidgetHostView_->render_widget_host_->ImeConfirmComposition(); |
2103 | 2104 |
2104 [self cancelComposition]; | 2105 [self cancelComposition]; |
2105 } | 2106 } |
2106 | 2107 |
| 2108 // Tag is used solely for ViewID. Override to prevent changing of it. |
| 2109 - (NSInteger)tag { |
| 2110 return view_id_util::ViewIDToTag(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW); |
| 2111 } |
| 2112 |
2107 @end | 2113 @end |
OLD | NEW |