Add NPChannelBase::GetModalDialogEvent() to avoid content/plugin/ include from npobject_proxy.cc

content/common/npobject_proxy.cc

 // Copyright (c) 2011 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 "content/common/npobject_proxy.h"
 
+#include "content/common/np_channel_base.h"
 #include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
-#include "content/plugin/plugin_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 
 using WebKit::WebBindings;
 
 struct NPObjectWrapper {
     NPObject object;
     NPObjectProxy* proxy;
 };
@@ skipping 180 matching lines @@
   NPVariant_Param param_result;
   NPObjectMsg_Invoke* msg = new NPObjectMsg_Invoke(
       proxy->route_id_, is_default, name_param, args_param, &param_result,
       &result);
 
   // If we're in the plugin process and this invoke leads to a dialog box, the
   // plugin will hang the window hierarchy unless we pump the window message
   // queue while waiting for a reply.  We need to do this to simulate what
   // happens when everything runs in-process (while calling MessageBox window
   // messages are pumped).
-  if (IsPluginProcess()) {
-    PluginChannel* channel = static_cast<PluginChannel*>(proxy->channel_.get());
-    if (channel) {
-      msg->set_pump_messages_event(
-          channel->GetModalDialogEvent(containing_window));
-    }
+  if (IsPluginProcess() && proxy->channel()) {
+    msg->set_pump_messages_event(
+        proxy->channel()->GetModalDialogEvent(containing_window));
   }
 
   GURL page_url = proxy->page_url_;
   proxy->Send(msg);
 
   // Send may delete proxy.
   proxy = NULL;
 
   if (!result)
     return false;
@@ skipping 197 matching lines @@
         args[i], channel_copy, &param, false, containing_window,
         proxy->page_url_);
     args_param.push_back(param);
   }
 
   NPVariant_Param param_result;
   NPObjectMsg_Construct* msg = new NPObjectMsg_Construct(
       proxy->route_id_, args_param, &param_result, &result);
 
   // See comment in NPObjectProxy::NPInvokePrivate.
-  if (IsPluginProcess()) {
-    PluginChannel* channel = static_cast<PluginChannel*>(proxy->channel_.get());
-    if (channel) {
-      msg->set_pump_messages_event(
-          channel->GetModalDialogEvent(proxy->containing_window_));
-    }
+  if (IsPluginProcess() && proxy->channel()) {
+    msg->set_pump_messages_event(
+        proxy->channel()->GetModalDialogEvent(proxy->containing_window_));
   }
 
   GURL page_url = proxy->page_url_;
   proxy->Send(msg);
 
   // Send may delete proxy.
   proxy = NULL;
 
   if (!result)
     return false;
@@ skipping 27 matching lines @@
   std::string script_str = std::string(
       script->UTF8Characters, script->UTF8Length);
 
   NPObjectMsg_Evaluate* msg = new NPObjectMsg_Evaluate(proxy->route_id(),
                                                        script_str,
                                                        popups_allowed,
                                                        &result_param,
                                                        &result);
 
   // See comment in NPObjectProxy::NPInvokePrivate.
-  if (IsPluginProcess()) {
-    PluginChannel* channel = static_cast<PluginChannel*>(proxy->channel_.get());
-    if (channel) {
-      msg->set_pump_messages_event(
-          channel->GetModalDialogEvent(proxy->containing_window_));
-    }
+  if (IsPluginProcess() && proxy->channel()) {
+    msg->set_pump_messages_event(
+        proxy->channel()->GetModalDialogEvent(containing_window));
   }
   scoped_refptr<NPChannelBase> channel(proxy->channel_);
 
   GURL page_url = proxy->page_url_;
   proxy->Send(msg);
   // Send may delete proxy.
   proxy = NULL;
   if (!result)
     return false;
 
   CreateNPVariant(
       result_param, channel.get(), result_var, containing_window, page_url);
   return true;
 }