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