move GrantUniversalPermissions to Content

rogerwang · rogerwang · commit 9e5b3ad4c280 · 2014-02-21T13:13:40.000+08:00
diff --git a/src/api/api_messages.h b/src/api/api_messages.h
@@ -98,8 +98,5 @@ IPC_MESSAGE_CONTROL0(ShellViewMsg_Reopen)
 // clear cache on the renderer side
 IPC_MESSAGE_CONTROL0(ShellViewMsg_ClearCache)
 
-// grant the policy permissions
-IPC_SYNC_MESSAGE_ROUTED0_1(ShellViewHostMsg_GrantUniversalPermissions, int)
-
 IPC_SYNC_MESSAGE_ROUTED0_1(ShellViewHostMsg_AllocateId, int)
 
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -107,7 +107,6 @@ bool DispatcherHost::OnMessageReceived(const IPC::Message& message) {
                         OnUncaughtException);
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_GetShellId, OnGetShellId);
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_CreateShell, OnCreateShell);
-    IPC_MESSAGE_HANDLER(ShellViewHostMsg_GrantUniversalPermissions, OnGrantUniversalPermissions);
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_AllocateId, OnAllocateId);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -278,16 +277,6 @@ void DispatcherHost::OnCreateShell(const std::string& url,
   }
 }
 
-void DispatcherHost::OnGrantUniversalPermissions(int *ret) {
-  content::Shell* shell =
-      content::Shell::FromRenderViewHost(render_view_host());
-  if (shell->nodejs()) {
-    content::ChildProcessSecurityPolicy::GetInstance()->GrantUniversalAccess(shell->web_contents()->GetRenderProcessHost()->GetID());
-    *ret = 1;
-  }else
-    *ret = 0;
-}
-
 void DispatcherHost::OnAllocateId(int * ret) {
   *ret = AllocateId();
 }
diff --git a/src/api/dispatcher_host.h b/src/api/dispatcher_host.h
@@ -105,7 +105,6 @@ class DispatcherHost : public content::RenderViewHostObserver {
   void OnCreateShell(const std::string& url,
                      const base::DictionaryValue& manifest,
                      int* routing_id);
-  void OnGrantUniversalPermissions(int* ret);
   void OnAllocateId(int* ret);
   DISALLOW_COPY_AND_ASSIGN(DispatcherHost);
 };
diff --git a/src/renderer/shell_content_renderer_client.cc b/src/renderer/shell_content_renderer_client.cc
@@ -32,6 +32,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/renderer/page_click_tracker.h"
+#include "content/common/view_messages.h"
 #include "content/nw/src/api/dispatcher.h"
 #include "content/nw/src/api/api_messages.h"
 #include "content/nw/src/api/window_bindings.h"
@@ -230,9 +231,9 @@ bool ShellContentRendererClient::WillSetSecurityToken(
     context->SetSecurityToken(node::g_context->GetSecurityToken());
     frame->document().securityOrigin().grantUniversalAccess();
 
-    int ret;
+    int ret = 0;
     RenderViewImpl* rv = RenderViewImpl::FromWebView(frame->view());
-    rv->Send(new ShellViewHostMsg_GrantUniversalPermissions(rv->GetRoutingID(), &ret));
+    rv->Send(new ViewHostMsg_GrantUniversalPermissions(rv->GetRoutingID(), &ret));
 
     return true;
   }
