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