| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_mac.h" | 5 #include "chrome/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 <cmath> | 9 #include <cmath> |
| 10 | 10 |
| (...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1158 if (text_input_type_ == ui::TEXT_INPUT_TYPE_PASSWORD) | 1158 if (text_input_type_ == ui::TEXT_INPUT_TYPE_PASSWORD) |
| 1159 EnablePasswordInput(); | 1159 EnablePasswordInput(); |
| 1160 else | 1160 else |
| 1161 DisablePasswordInput(); | 1161 DisablePasswordInput(); |
| 1162 } else { | 1162 } else { |
| 1163 if (text_input_type_ == ui::TEXT_INPUT_TYPE_PASSWORD) | 1163 if (text_input_type_ == ui::TEXT_INPUT_TYPE_PASSWORD) |
| 1164 DisablePasswordInput(); | 1164 DisablePasswordInput(); |
| 1165 } | 1165 } |
| 1166 } | 1166 } |
| 1167 | 1167 |
| 1168 // static | |
| 1169 void RenderWidgetHostView::GetDefaultScreenInfo( | |
| 1170 WebKit::WebScreenInfo* results) { | |
| 1171 *results = WebKit::WebScreenInfoFactory::screenInfo(NULL); | |
| 1172 } | |
| 1173 | |
| 1174 // RenderWidgetHostViewCocoa --------------------------------------------------- | 1168 // RenderWidgetHostViewCocoa --------------------------------------------------- |
| 1175 | 1169 |
| 1176 @implementation RenderWidgetHostViewCocoa | 1170 @implementation RenderWidgetHostViewCocoa |
| 1177 | 1171 |
| 1178 @synthesize selectedRange = selectedRange_; | 1172 @synthesize selectedRange = selectedRange_; |
| 1179 @synthesize markedRange = markedRange_; | 1173 @synthesize markedRange = markedRange_; |
| 1180 @synthesize gotUnhandledWheelEvent = gotUnhandledWheelEvent_; | 1174 @synthesize gotUnhandledWheelEvent = gotUnhandledWheelEvent_; |
| 1181 @synthesize isPinnedLeft = isPinnedLeft_; | 1175 @synthesize isPinnedLeft = isPinnedLeft_; |
| 1182 @synthesize isPinnedRight = isPinnedRight_; | 1176 @synthesize isPinnedRight = isPinnedRight_; |
| 1183 @synthesize hasHorizontalScrollbar = hasHorizontalScrollbar_; | 1177 @synthesize hasHorizontalScrollbar = hasHorizontalScrollbar_; |
| (...skipping 1692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2876 if (!string) return NO; | 2870 if (!string) return NO; |
| 2877 | 2871 |
| 2878 // If the user is currently using an IME, confirm the IME input, | 2872 // If the user is currently using an IME, confirm the IME input, |
| 2879 // and then insert the text from the service, the same as TextEdit and Safari. | 2873 // and then insert the text from the service, the same as TextEdit and Safari. |
| 2880 [self confirmComposition]; | 2874 [self confirmComposition]; |
| 2881 [self insertText:string]; | 2875 [self insertText:string]; |
| 2882 return YES; | 2876 return YES; |
| 2883 } | 2877 } |
| 2884 | 2878 |
| 2885 @end | 2879 @end |
| OLD | NEW |