Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/bind_helpers.h" | 5 #include "base/bind_helpers.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "content/browser/browser_plugin/browser_plugin_guest.h" | 9 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
| 10 #include "content/browser/frame_host/render_widget_host_view_guest.h" | 10 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 435 platform_view_->StopSpeaking(); | 435 platform_view_->StopSpeaking(); |
| 436 } | 436 } |
| 437 | 437 |
| 438 bool RenderWidgetHostViewGuest::PostProcessEventForPluginIme( | 438 bool RenderWidgetHostViewGuest::PostProcessEventForPluginIme( |
| 439 const NativeWebKeyboardEvent& event) { | 439 const NativeWebKeyboardEvent& event) { |
| 440 return false; | 440 return false; |
| 441 } | 441 } |
| 442 | 442 |
| 443 #endif // defined(OS_MACOSX) | 443 #endif // defined(OS_MACOSX) |
| 444 | 444 |
| 445 #if defined(OS_ANDROID) | 445 #if defined(OS_ANDROID) || defined(OS_WIN) |
|
sky
2014/08/04 20:05:19
OS_WIN->TOOLKIT_VIEWS
luken
2014/09/11 01:07:27
Done.
| |
| 446 void RenderWidgetHostViewGuest::ShowDisambiguationPopup( | 446 void RenderWidgetHostViewGuest::ShowDisambiguationPopup( |
| 447 const gfx::Rect& target_rect, | 447 const gfx::Rect& target_rect, |
| 448 const SkBitmap& zoomed_bitmap) { | 448 const SkBitmap& zoomed_bitmap) { |
| 449 } | 449 } |
| 450 #endif // defined(OS_ANDROID) || defined(OS_WIN) | |
| 450 | 451 |
| 452 #if defined(OS_ANDROID) | |
| 451 void RenderWidgetHostViewGuest::LockCompositingSurface() { | 453 void RenderWidgetHostViewGuest::LockCompositingSurface() { |
| 452 } | 454 } |
| 453 | 455 |
| 454 void RenderWidgetHostViewGuest::UnlockCompositingSurface() { | 456 void RenderWidgetHostViewGuest::UnlockCompositingSurface() { |
| 455 } | 457 } |
| 456 #endif // defined(OS_ANDROID) | 458 #endif // defined(OS_ANDROID) |
| 457 | 459 |
| 458 #if defined(OS_WIN) | 460 #if defined(OS_WIN) |
| 459 void RenderWidgetHostViewGuest::SetParentNativeViewAccessible( | 461 void RenderWidgetHostViewGuest::SetParentNativeViewAccessible( |
| 460 gfx::NativeViewAccessible accessible_parent) { | 462 gfx::NativeViewAccessible accessible_parent) { |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 548 return kN32_SkColorType; | 550 return kN32_SkColorType; |
| 549 } | 551 } |
| 550 | 552 |
| 551 RenderWidgetHostViewBase* | 553 RenderWidgetHostViewBase* |
| 552 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const { | 554 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const { |
| 553 return static_cast<RenderWidgetHostViewBase*>( | 555 return static_cast<RenderWidgetHostViewBase*>( |
| 554 guest_->GetEmbedderRenderWidgetHostView()); | 556 guest_->GetEmbedderRenderWidgetHostView()); |
| 555 } | 557 } |
| 556 | 558 |
| 557 } // namespace content | 559 } // namespace content |
| OLD | NEW |