Make PepperWebPlugin not use RenderViews.

chrome/browser/renderer_host/pepper/pepper_talk_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/pepper/pepper_talk_host.h"
 
 #include "base/bind.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_frame_host.h"
 #include "grit/generated_resources.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "ui/aura/window.h"
 #endif
 
 namespace chrome {
 
 namespace {
 
 ppapi::host::ReplyMessageContext GetPermissionOnUIThread(
     PP_TalkPermission permission,
     int render_process_id,
-    int render_view_id,
+    int render_frame_id,
     ppapi::host::ReplyMessageContext reply) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   reply.params.set_result(0);
 
-  content::RenderViewHost* render_view_host =
-      content::RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!render_view_host)
-    return reply;  // RVH destroyed while task was pending.
+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
+  if (!render_frame_host)
+    return reply;  // RFH destroyed while task was pending.
 
 #if defined(USE_ASH)
   base::string16 title;
   base::string16 message;
 
   switch (permission) {
     case PP_TALKPERMISSION_SCREENCAST:
       title = l10n_util::GetStringUTF16(IDS_GTALK_SCREEN_SHARE_DIALOG_TITLE);
       message = l10n_util::GetStringUTF16(
           IDS_GTALK_SCREEN_SHARE_DIALOG_MESSAGE);
@@ skipping 31 matching lines @@
 #if defined(USE_ASH) && defined(OS_CHROMEOS)
 void OnTerminateRemotingEventOnUIThread(const base::Closure& stop_callback) {
   content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
                                    stop_callback);
 }
 #endif  // defined(USE_ASH) && defined(OS_CHROMEOS)
 
 ppapi::host::ReplyMessageContext StartRemotingOnUIThread(
     const base::Closure& stop_callback,
     int render_process_id,
-    int render_view_id,
+    int render_frame_id,
     ppapi::host::ReplyMessageContext reply) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  content::RenderViewHost* render_view_host =
-      content::RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!render_view_host) {
+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
+  if (!render_frame_host) {
     reply.params.set_result(PP_ERROR_FAILED);
-    return reply;  // RVH destroyed while task was pending.
+    return reply;  // RFH destroyed while task was pending.
   }
 
 #if defined(USE_ASH) && defined(OS_CHROMEOS)
   base::Closure stop_callback_ui_thread = base::Bind(
       &OnTerminateRemotingEventOnUIThread,
       stop_callback);
 
   ash::Shell::GetInstance()->system_tray_notifier()->NotifyScreenShareStart(
       stop_callback_ui_thread, base::string16());
   reply.params.set_result(PP_OK);
@@ skipping 56 matching lines @@
 }
 
 int32_t PepperTalkHost::OnRequestPermission(
     ppapi::host::HostMessageContext* context,
     PP_TalkPermission permission) {
   if (permission < PP_TALKPERMISSION_SCREENCAST ||
       permission >= PP_TALKPERMISSION_NUM_PERMISSIONS)
     return PP_ERROR_BADARGUMENT;
 
   int render_process_id = 0;
-  int render_view_id = 0;
-  browser_ppapi_host_->GetRenderViewIDsForInstance(
-      pp_instance(), &render_process_id, &render_view_id);
+  int render_frame_id = 0;
+  browser_ppapi_host_->GetRenderFrameIDsForInstance(
+      pp_instance(), &render_process_id, &render_frame_id);
 
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&GetPermissionOnUIThread, permission, render_process_id,
-                 render_view_id, context->MakeReplyMessageContext()),
+                 render_frame_id, context->MakeReplyMessageContext()),
       base::Bind(&PepperTalkHost::OnRequestPermissionCompleted,
                  weak_factory_.GetWeakPtr()));
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PepperTalkHost::OnStartRemoting(
     ppapi::host::HostMessageContext* context) {
   int render_process_id = 0;
-  int render_view_id = 0;
-  browser_ppapi_host_->GetRenderViewIDsForInstance(
-      pp_instance(), &render_process_id, &render_view_id);
+  int render_frame_id = 0;
+  browser_ppapi_host_->GetRenderFrameIDsForInstance(
+      pp_instance(), &render_process_id, &render_frame_id);
 
   base::Closure remoting_stop_callback = base::Bind(
       &PepperTalkHost::OnRemotingStopEvent,
       weak_factory_.GetWeakPtr());
 
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&StartRemotingOnUIThread, remoting_stop_callback,
-                 render_process_id, render_view_id,
+                 render_process_id, render_frame_id,
                  context->MakeReplyMessageContext()),
       base::Bind(&PepperTalkHost::OnStartRemotingCompleted,
                  weak_factory_.GetWeakPtr()));
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PepperTalkHost::OnStopRemoting(
     ppapi::host::HostMessageContext* context) {
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::UI, FROM_HERE,
@@ skipping 28 matching lines @@
 }
 
 void PepperTalkHost::OnStopRemotingCompleted(
     ppapi::host::ReplyMessageContext reply) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   remoting_started_ = false;
   host()->SendReply(reply, PpapiPluginMsg_Talk_StopRemotingReply());
 }
 
 }  // namespace chrome