Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1840)

Unified Diff: content/renderer/pepper/pepper_plugin_delegate_impl.cc

Issue 10091003: Convert flash to thunk (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/pepper_plugin_delegate_impl.h ('k') | ppapi/ppapi_shared.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_plugin_delegate_impl.cc
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index debbd559013f946169758af8f39b452ece7adfd2..2f7eb8ba04e05b5419e08e8d99af589811d8a971 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -1139,7 +1139,7 @@ int32_t PepperPluginDelegateImpl::ShowContextMenu(
webkit::ppapi::PPB_Flash_Menu_Impl* menu,
const gfx::Point& position) {
int32 render_widget_id = render_view_->routing_id();
- if (instance->FlashIsFullscreen(instance->pp_instance())) {
+ if (instance->flash_fullscreen()) {
webkit::ppapi::FullscreenContainer* container =
instance->fullscreen_container();
DCHECK(container);
@@ -1159,8 +1159,7 @@ int32_t PepperPluginDelegateImpl::ShowContextMenu(
params.custom_items = menu->menu_data();
// Transform the position to be in render view's coordinates.
- if (instance->view_data().is_fullscreen ||
- instance->FlashIsFullscreen(instance->pp_instance())) {
+ if (instance->view_data().is_fullscreen || instance->flash_fullscreen()) {
WebKit::WebRect rect = render_view_->windowRect();
params.x -= rect.x;
params.y -= rect.y;
@@ -1275,11 +1274,6 @@ double PepperPluginDelegateImpl::GetLocalTimeZoneOffset(base::Time t) {
return result;
}
-std::string PepperPluginDelegateImpl::GetFlashCommandLineArgs() {
- return CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kPpapiFlashArgs);
-}
-
base::SharedMemory* PepperPluginDelegateImpl::CreateAnonymousSharedMemory(
uint32_t size) {
if (size == 0)
« no previous file with comments | « content/renderer/pepper/pepper_plugin_delegate_impl.h ('k') | ppapi/ppapi_shared.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698