Chromium Code Reviews| 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 <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 "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 653 | 653 |
| 654 void RenderWidgetHostViewMac::KillSelf() { | 654 void RenderWidgetHostViewMac::KillSelf() { |
| 655 if (shutdown_factory_.empty()) { | 655 if (shutdown_factory_.empty()) { |
| 656 [cocoa_view_ setHidden:YES]; | 656 [cocoa_view_ setHidden:YES]; |
| 657 MessageLoop::current()->PostTask(FROM_HERE, | 657 MessageLoop::current()->PostTask(FROM_HERE, |
| 658 shutdown_factory_.NewRunnableMethod( | 658 shutdown_factory_.NewRunnableMethod( |
| 659 &RenderWidgetHostViewMac::ShutdownHost)); | 659 &RenderWidgetHostViewMac::ShutdownHost)); |
| 660 } | 660 } |
| 661 } | 661 } |
| 662 | 662 |
| 663 void RenderWidgetHostViewMac::PpapiPluginFocusChanged(bool focused) { | |
|
kochi
2011/05/25 06:19:44
TODO(kinaba): Implement this.
is fine for now.
If
kinaba
2011/05/25 22:23:53
Removed from the patch set 2.
I have, but it is a
| |
| 664 } | |
| 665 | |
| 663 void RenderWidgetHostViewMac::PluginFocusChanged(bool focused, int plugin_id) { | 666 void RenderWidgetHostViewMac::PluginFocusChanged(bool focused, int plugin_id) { |
| 664 [cocoa_view_ pluginFocusChanged:(focused ? YES : NO) forPlugin:plugin_id]; | 667 [cocoa_view_ pluginFocusChanged:(focused ? YES : NO) forPlugin:plugin_id]; |
| 665 } | 668 } |
| 666 | 669 |
| 667 void RenderWidgetHostViewMac::StartPluginIme() { | 670 void RenderWidgetHostViewMac::StartPluginIme() { |
| 668 [cocoa_view_ setPluginImeActive:YES]; | 671 [cocoa_view_ setPluginImeActive:YES]; |
| 669 } | 672 } |
| 670 | 673 |
| 671 bool RenderWidgetHostViewMac::PostProcessEventForPluginIme( | 674 bool RenderWidgetHostViewMac::PostProcessEventForPluginIme( |
| 672 const NativeWebKeyboardEvent& event) { | 675 const NativeWebKeyboardEvent& event) { |
| (...skipping 1896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2569 if (!string) return NO; | 2572 if (!string) return NO; |
| 2570 | 2573 |
| 2571 // If the user is currently using an IME, confirm the IME input, | 2574 // If the user is currently using an IME, confirm the IME input, |
| 2572 // and then insert the text from the service, the same as TextEdit and Safari. | 2575 // and then insert the text from the service, the same as TextEdit and Safari. |
| 2573 [self confirmComposition]; | 2576 [self confirmComposition]; |
| 2574 [self insertText:string]; | 2577 [self insertText:string]; |
| 2575 return YES; | 2578 return YES; |
| 2576 } | 2579 } |
| 2577 | 2580 |
| 2578 @end | 2581 @end |
| OLD | NEW |