<webview>: Refactor Permission API to chrome

content/renderer/browser_plugin/browser_plugin.cc

 // Copyright 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 "content/renderer/browser_plugin/browser_plugin.h"
 
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 41 matching lines @@
 using WebKit::WebVector;
 
 namespace content {
 
 namespace {
 
 static std::string GetInternalEventName(const char* event_name) {
   return base::StringPrintf("-internal-%s", event_name);
 }
 
-static std::string PermissionTypeToString(BrowserPluginPermissionType type) {
-  switch (type) {
-    case BrowserPluginPermissionTypeDownload:
-      return browser_plugin::kPermissionTypeDownload;
-    case BrowserPluginPermissionTypeGeolocation:
-      return browser_plugin::kPermissionTypeGeolocation;
-    case BrowserPluginPermissionTypeMedia:
-      return browser_plugin::kPermissionTypeMedia;
-    case BrowserPluginPermissionTypeNewWindow:
-      return browser_plugin::kPermissionTypeNewWindow;
-    case BrowserPluginPermissionTypePointerLock:
-      return browser_plugin::kPermissionTypePointerLock;
-    case BrowserPluginPermissionTypeJavaScriptDialog:
-      return browser_plugin::kPermissionTypeDialog;
-    case BrowserPluginPermissionTypeUnknown:
-    default:
-      NOTREACHED();
-      break;
-  }
-  return std::string();
-}
-
 typedef std::map<WebKit::WebPluginContainer*,
                  BrowserPlugin*> PluginContainerMap;
 static base::LazyInstance<PluginContainerMap> g_plugin_container_map =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 BrowserPlugin::BrowserPlugin(
     RenderViewImpl* render_view,
     WebKit::WebFrame* frame,
@@ skipping 47 matching lines @@
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPlugin, message)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_AdvanceFocus, OnAdvanceFocus)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_Attach_ACK, OnAttachACK)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_BuffersSwapped, OnBuffersSwapped)
     IPC_MESSAGE_HANDLER_GENERIC(BrowserPluginMsg_CompositorFrameSwapped,
                                 OnCompositorFrameSwapped(message))
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestContentWindowReady,
                         OnGuestContentWindowReady)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestGone, OnGuestGone)
-    IPC_MESSAGE_HANDLER(BrowserPluginMsg_RequestPermission, OnRequestPermission)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetCursor, OnSetCursor)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetMouseLock, OnSetMouseLock)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_ShouldAcceptTouchEvents,
                         OnShouldAcceptTouchEvents)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdatedName, OnUpdatedName)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdateRect, OnUpdateRect)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
@@ skipping 314 matching lines @@
   // Queue up showing the sad graphic to give content embedders an opportunity
   // to fire their listeners and potentially overlay the webview with custom
   // behavior. If the BrowserPlugin is destroyed in the meantime, then the
   // task will not be executed.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&BrowserPlugin::ShowSadGraphic,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void BrowserPlugin::OnRequestPermission(
-    int guest_instance_id,
-    BrowserPluginPermissionType permission_type,
-    int request_id,
-    const base::DictionaryValue& request_info) {
-  // The New Window API is very similiar to the permission API in structure,
-  // but exposes a slightly different interface to the developer and so we put
-  // it in a separate event.
-  const char* event_name = NULL;
-  if (permission_type == BrowserPluginPermissionTypeNewWindow) {
-    event_name = browser_plugin::kEventNewWindow;
-  } else if (permission_type == BrowserPluginPermissionTypeJavaScriptDialog) {
-    event_name = browser_plugin::kEventDialog;
-  } else {
-    event_name = browser_plugin::kEventRequestPermission;
-  }
-  AddPermissionRequestToSet(request_id);
-
-  std::map<std::string, base::Value*> props;
-  props[browser_plugin::kPermission] =
-      base::Value::CreateStringValue(PermissionTypeToString(permission_type));
-  props[browser_plugin::kRequestId] =
-      base::Value::CreateIntegerValue(request_id);
-
-  // Fill in the info provided by the browser.
-  for (DictionaryValue::Iterator iter(request_info); !iter.IsAtEnd();
-           iter.Advance()) {
-    props[iter.key()] = iter.value().DeepCopy();
-  }
-  TriggerEvent(event_name, &props);
-}
-
 void BrowserPlugin::OnSetCursor(int guest_instance_id,
                                 const WebCursor& cursor) {
   cursor_ = cursor;
 }
 
 void BrowserPlugin::OnSetMouseLock(int guest_instance_id,
                                    bool enable) {
   if (enable) {
     if (mouse_locked_)
       return;
@@ skipping 14 matching lines @@
         WebKit::WebPluginContainer::TouchEventRequestTypeRaw :
         WebKit::WebPluginContainer::TouchEventRequestTypeNone);
   }
 }
 
 void BrowserPlugin::OnUpdatedName(int guest_instance_id,
                                   const std::string& name) {
   UpdateDOMAttribute(browser_plugin::kAttributeName, name);
 }
 
-void BrowserPlugin::AddPermissionRequestToSet(int request_id) {
-  DCHECK(!pending_permission_requests_.count(request_id));
-  pending_permission_requests_.insert(request_id);
-}
-
 void BrowserPlugin::OnUpdateRect(
     int guest_instance_id,
     const BrowserPluginMsg_UpdateRect_Params& params) {
   // If the guest has updated pixels then it is no longer crashed.
   guest_crashed_ = false;
 
   bool use_new_damage_buffer = !backing_store_;
   BrowserPluginHostMsg_AutoSize_Params auto_size_params;
   BrowserPluginHostMsg_ResizeGuest_Params resize_guest_params;
   // If we have a pending damage buffer, and the guest has begun to use the
@@ skipping 394 matching lines @@
   bool embedder_focused = false;
   if (render_view_.get())
     embedder_focused = render_view_->has_focus();
   return plugin_focused_ && embedder_focused;
 }
 
 WebKit::WebPluginContainer* BrowserPlugin::container() const {
   return container_;
 }
 
-void BrowserPlugin::RespondPermission(
-    int request_id, bool allow, const std::string& user_input) {
-  browser_plugin_manager()->Send(
-      new BrowserPluginHostMsg_RespondPermission(
-          render_view_routing_id_, guest_instance_id_,
-          request_id, allow, user_input));
-}
-
-bool BrowserPlugin::RespondPermissionIfRequestIsPending(
-    int request_id, bool allow, const std::string& user_input) {
-  PendingPermissionRequests::iterator iter =
-      pending_permission_requests_.find(request_id);
-  if (iter == pending_permission_requests_.end())
-    return false;
-
-  pending_permission_requests_.erase(iter);
-  RespondPermission(request_id, allow, user_input);
-  return true;
-}
-
 bool BrowserPlugin::initialize(WebPluginContainer* container) {
   if (!container)
     return false;
 
   if (!GetContentClient()->renderer()->AllowBrowserPlugin(container))
     return false;
 
   // Tell |container| to allow this plugin to use script objects.
   npp_.reset(new NPP_t);
   container->allowScriptObjects();
@@ skipping 144 matching lines @@
 // static
 bool BrowserPlugin::ShouldForwardToBrowserPlugin(
     const IPC::Message& message) {
   switch (message.type()) {
     case BrowserPluginMsg_AdvanceFocus::ID:
     case BrowserPluginMsg_Attach_ACK::ID:
     case BrowserPluginMsg_BuffersSwapped::ID:
     case BrowserPluginMsg_CompositorFrameSwapped::ID:
     case BrowserPluginMsg_GuestContentWindowReady::ID:
     case BrowserPluginMsg_GuestGone::ID:
-    case BrowserPluginMsg_RequestPermission::ID:
     case BrowserPluginMsg_SetCursor::ID:
     case BrowserPluginMsg_SetMouseLock::ID:
     case BrowserPluginMsg_ShouldAcceptTouchEvents::ID:
     case BrowserPluginMsg_UpdatedName::ID:
     case BrowserPluginMsg_UpdateRect::ID:
       return true;
     default:
       break;
   }
   return false;
@@ skipping 282 matching lines @@
     const WebKit::WebMouseEvent& event) {
   browser_plugin_manager()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
                                                 guest_instance_id_,
                                                 plugin_rect_,
                                                 &event));
   return true;
 }
 
 }  // namespace content