Merge lp:~abreu-alexandre/oxide/stub-quota-context-1-4 into lp:oxide/1.4

[Alexandre Abreu]

Stub the quota permission context to avoid crashes when e.g. storage quota is requested.

Stub the quota permission context to avoid crashes when e.g. storage quota is requested.

[lp:~abreu-alexandre/oxide/stub-quota-context-1-4]

879. By Alexandre Abreu on 2014-12-03

remove header clutter

[Chris Coulson (chrisccoulson)]

It would probably be good to merge this in to trunk as well, at least whilst I'm reviewing the other branch

review: Approve

=== modified file 'shared/browser/oxide_content_browser_client.cc'
--- shared/browser/oxide_content_browser_client.cc	2014-11-15 17:32:48 +0000
+++ shared/browser/oxide_content_browser_client.cc	2014-12-03 13:42:53 +0000
@@ -50,6 +50,7 @@
 #include "oxide_browser_process_main.h"
 #include "oxide_devtools_manager_delegate.h"
 #include "oxide_form_factor.h"
+#include "oxide_quota_permission_context.h"
 #include "oxide_resource_dispatcher_host_delegate.h"
 #include "oxide_script_message_dispatcher_browser.h"
 #include "oxide_user_agent_override_provider.h"
@@ -344,4 +345,8 @@
   platform_integration_.reset(integration);
 }
 
+content::QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() {
+  return new QuotaPermissionContext();
+}
+
 } // namespace oxide
 
=== modified file 'shared/browser/oxide_content_browser_client.h'
--- shared/browser/oxide_content_browser_client.h	2014-11-13 08:41:43 +0000
+++ shared/browser/oxide_content_browser_client.h	2014-12-03 13:42:53 +0000
@@ -30,6 +30,7 @@
 }
 
 namespace content {
+class QuotaPermissionContext;
 class RenderViewHost;
 class ResourceDispatcherHostDelegate;
 }
@@ -127,6 +128,7 @@
   content::LocationProvider* OverrideSystemLocationProvider() final;
   content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() final;
   void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) final;
+  content::QuotaPermissionContext* CreateQuotaPermissionContext() final;
 
   scoped_ptr<BrowserPlatformIntegration> platform_integration_;
 
 
=== added file 'shared/browser/oxide_quota_permission_context.cc'
--- shared/browser/oxide_quota_permission_context.cc	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_quota_permission_context.cc	2014-12-03 13:42:53 +0000
@@ -0,0 +1,36 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_quota_permission_context.h"
+
+namespace oxide {
+  
+QuotaPermissionContext::QuotaPermissionContext() {
+}
+
+QuotaPermissionContext::~QuotaPermissionContext() {
+}
+
+void QuotaPermissionContext::RequestQuotaPermission(
+    const content::StorageQuotaParams& params,
+    int render_process_id,
+    const content::QuotaPermissionContext::PermissionCallback& callback) {
+  callback.Run(QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_DISALLOW);
+}
+
+} // namespace oxide
+
 
=== added file 'shared/browser/oxide_quota_permission_context.h'
--- shared/browser/oxide_quota_permission_context.h	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_quota_permission_context.h	2014-12-03 13:42:53 +0000
@@ -0,0 +1,45 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_QUOTA_PERMISSION_CONTEXT_H_
+#define _OXIDE_SHARED_BROWSER_QUOTA_PERMISSION_CONTEXT_H_
+
+#include "content/public/browser/quota_permission_context.h"
+#include "storage/common/quota/quota_types.h"
+
+namespace oxide {
+  
+class QuotaPermissionContext final :
+    public content::QuotaPermissionContext {
+ public:
+  QuotaPermissionContext();
+  ~QuotaPermissionContext();
+
+  void RequestQuotaPermission(
+      const content::StorageQuotaParams& params,
+      int render_process_id,
+      const content::QuotaPermissionContext::PermissionCallback& callback) final;
+
+ private:
+
+  DISALLOW_COPY_AND_ASSIGN(QuotaPermissionContext);
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_QUOTA_PERMISSION_CONTEXT_H_
+
 
=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2014-11-18 08:02:53 +0000
+++ shared/shared.gyp	2014-12-03 13:42:53 +0000
@@ -289,6 +289,8 @@
         'browser/oxide_permission_request.h',
         'browser/oxide_power_save_blocker.cc',
         'browser/oxide_power_save_blocker.h',
+        'browser/oxide_quota_permission_context.cc',
+        'browser/oxide_quota_permission_context.h',
         'browser/oxide_renderer_frame_evictor.cc',
         'browser/oxide_renderer_frame_evictor.h',
         'browser/oxide_render_widget_host_view.cc',