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 #import <objc/runtime.h> | 7 #import <objc/runtime.h> |
8 #include <QuartzCore/QuartzCore.h> | 8 #include <QuartzCore/QuartzCore.h> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
899 } | 899 } |
900 | 900 |
901 void RenderWidgetHostViewMac::SetIsLoading(bool is_loading) { | 901 void RenderWidgetHostViewMac::SetIsLoading(bool is_loading) { |
902 is_loading_ = is_loading; | 902 is_loading_ = is_loading; |
903 // If we ever decide to show the waiting cursor while the page is loading | 903 // If we ever decide to show the waiting cursor while the page is loading |
904 // like Chrome does on Windows, call |UpdateCursor()| here. | 904 // like Chrome does on Windows, call |UpdateCursor()| here. |
905 } | 905 } |
906 | 906 |
907 void RenderWidgetHostViewMac::TextInputTypeChanged( | 907 void RenderWidgetHostViewMac::TextInputTypeChanged( |
908 ui::TextInputType type, | 908 ui::TextInputType type, |
909 bool can_compose_inline, | 909 ui::TextInputMode input_mode, |
910 ui::TextInputMode input_mode) { | 910 bool can_compose_inline) { |
911 if (text_input_type_ != type | 911 if (text_input_type_ != type |
912 || can_compose_inline_ != can_compose_inline) { | 912 || can_compose_inline_ != can_compose_inline) { |
913 text_input_type_ = type; | 913 text_input_type_ = type; |
914 can_compose_inline_ = can_compose_inline; | 914 can_compose_inline_ = can_compose_inline; |
915 if (HasFocus()) { | 915 if (HasFocus()) { |
916 SetTextInputActive(true); | 916 SetTextInputActive(true); |
917 | 917 |
918 // Let AppKit cache the new input context to make IMEs happy. | 918 // Let AppKit cache the new input context to make IMEs happy. |
919 // See http://crbug.com/73039. | 919 // See http://crbug.com/73039. |
920 [NSApp updateWindows]; | 920 [NSApp updateWindows]; |
(...skipping 2925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3846 return YES; | 3846 return YES; |
3847 } | 3847 } |
3848 | 3848 |
3849 - (BOOL)isOpaque { | 3849 - (BOOL)isOpaque { |
3850 if (renderWidgetHostView_->use_core_animation_) | 3850 if (renderWidgetHostView_->use_core_animation_) |
3851 return YES; | 3851 return YES; |
3852 return [super isOpaque]; | 3852 return [super isOpaque]; |
3853 } | 3853 } |
3854 | 3854 |
3855 @end | 3855 @end |
OLD | NEW |