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" |
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1114 glMatrixMode(GL_MODELVIEW); | 1114 glMatrixMode(GL_MODELVIEW); |
1115 glLoadIdentity(); | 1115 glLoadIdentity(); |
1116 | 1116 |
1117 plugin_container_manager_.Draw(context, plugin_handle); | 1117 plugin_container_manager_.Draw(context, plugin_handle); |
1118 } | 1118 } |
1119 | 1119 |
1120 void RenderWidgetHostViewMac::ForceTextureReload() { | 1120 void RenderWidgetHostViewMac::ForceTextureReload() { |
1121 plugin_container_manager_.ForceTextureReload(); | 1121 plugin_container_manager_.ForceTextureReload(); |
1122 } | 1122 } |
1123 | 1123 |
1124 void RenderWidgetHostViewMac::SetVisuallyDeemphasized(bool deemphasized) { | 1124 void RenderWidgetHostViewMac::SetVisuallyDeemphasized(const SkColor* color, |
1125 // Mac uses tab-modal sheets, so this is a no-op. | 1125 bool animate) { |
| 1126 // This is not used on mac. |
1126 } | 1127 } |
1127 | 1128 |
1128 void RenderWidgetHostViewMac::ShutdownHost() { | 1129 void RenderWidgetHostViewMac::ShutdownHost() { |
1129 shutdown_factory_.RevokeAll(); | 1130 shutdown_factory_.RevokeAll(); |
1130 render_widget_host_->Shutdown(); | 1131 render_widget_host_->Shutdown(); |
1131 // Do not touch any members at this point, |this| has been deleted. | 1132 // Do not touch any members at this point, |this| has been deleted. |
1132 } | 1133 } |
1133 | 1134 |
1134 bool RenderWidgetHostViewMac::IsVoiceOverRunning() { | 1135 bool RenderWidgetHostViewMac::IsVoiceOverRunning() { |
1135 NSUserDefaults* user_defaults = [NSUserDefaults standardUserDefaults]; | 1136 NSUserDefaults* user_defaults = [NSUserDefaults standardUserDefaults]; |
(...skipping 1542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2678 if (!string) return NO; | 2679 if (!string) return NO; |
2679 | 2680 |
2680 // 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, |
2681 // 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. |
2682 [self confirmComposition]; | 2683 [self confirmComposition]; |
2683 [self insertText:string]; | 2684 [self insertText:string]; |
2684 return YES; | 2685 return YES; |
2685 } | 2686 } |
2686 | 2687 |
2687 @end | 2688 @end |
OLD | NEW |