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 #include <QuartzCore/QuartzCore.h> | 7 #include <QuartzCore/QuartzCore.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 gfx::NativeViewId RenderWidgetHostViewMac::GetNativeViewId() const { | 477 gfx::NativeViewId RenderWidgetHostViewMac::GetNativeViewId() const { |
478 return reinterpret_cast<gfx::NativeViewId>(GetNativeView()); | 478 return reinterpret_cast<gfx::NativeViewId>(GetNativeView()); |
479 } | 479 } |
480 | 480 |
481 gfx::NativeViewAccessible RenderWidgetHostViewMac::GetNativeViewAccessible() { | 481 gfx::NativeViewAccessible RenderWidgetHostViewMac::GetNativeViewAccessible() { |
482 NOTIMPLEMENTED(); | 482 NOTIMPLEMENTED(); |
483 return static_cast<gfx::NativeViewAccessible>(NULL); | 483 return static_cast<gfx::NativeViewAccessible>(NULL); |
484 } | 484 } |
485 | 485 |
486 void RenderWidgetHostViewMac::MovePluginWindows( | 486 void RenderWidgetHostViewMac::MovePluginWindows( |
487 const gfx::Point& scroll_offset, | 487 const gfx::Vector2d& scroll_offset, |
488 const std::vector<webkit::npapi::WebPluginGeometry>& moves) { | 488 const std::vector<webkit::npapi::WebPluginGeometry>& moves) { |
489 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::MovePluginWindows"); | 489 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::MovePluginWindows"); |
490 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 490 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
491 // Handle movement of accelerated plugins, which are the only "windowed" | 491 // Handle movement of accelerated plugins, which are the only "windowed" |
492 // plugins that exist on the Mac. | 492 // plugins that exist on the Mac. |
493 for (std::vector<webkit::npapi::WebPluginGeometry>::const_iterator iter = | 493 for (std::vector<webkit::npapi::WebPluginGeometry>::const_iterator iter = |
494 moves.begin(); | 494 moves.begin(); |
495 iter != moves.end(); | 495 iter != moves.end(); |
496 ++iter) { | 496 ++iter) { |
497 webkit::npapi::WebPluginGeometry geom = *iter; | 497 webkit::npapi::WebPluginGeometry geom = *iter; |
(...skipping 2808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3306 if (!string) return NO; | 3306 if (!string) return NO; |
3307 | 3307 |
3308 // If the user is currently using an IME, confirm the IME input, | 3308 // If the user is currently using an IME, confirm the IME input, |
3309 // and then insert the text from the service, the same as TextEdit and Safari. | 3309 // and then insert the text from the service, the same as TextEdit and Safari. |
3310 [self confirmComposition]; | 3310 [self confirmComposition]; |
3311 [self insertText:string]; | 3311 [self insertText:string]; |
3312 return YES; | 3312 return YES; |
3313 } | 3313 } |
3314 | 3314 |
3315 @end | 3315 @end |
OLD | NEW |