Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 2592793002: Revert of Change how the quota system computes the total poolsize for temporary storage (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « android_webview/browser/aw_content_browser_client.h ('k') | ash/shell/content/client/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/browser/aw_content_browser_client.h" 5 #include "android_webview/browser/aw_content_browser_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "android_webview/browser/aw_browser_context.h" 9 #include "android_webview/browser/aw_browser_context.h"
10 #include "android_webview/browser/aw_browser_main_parts.h" 10 #include "android_webview/browser/aw_browser_main_parts.h"
(...skipping 29 matching lines...) Expand all
40 #include "components/spellcheck/spellcheck_build_features.h" 40 #include "components/spellcheck/spellcheck_build_features.h"
41 #include "content/public/browser/browser_message_filter.h" 41 #include "content/public/browser/browser_message_filter.h"
42 #include "content/public/browser/browser_thread.h" 42 #include "content/public/browser/browser_thread.h"
43 #include "content/public/browser/child_process_security_policy.h" 43 #include "content/public/browser/child_process_security_policy.h"
44 #include "content/public/browser/client_certificate_delegate.h" 44 #include "content/public/browser/client_certificate_delegate.h"
45 #include "content/public/browser/navigation_handle.h" 45 #include "content/public/browser/navigation_handle.h"
46 #include "content/public/browser/navigation_throttle.h" 46 #include "content/public/browser/navigation_throttle.h"
47 #include "content/public/browser/render_frame_host.h" 47 #include "content/public/browser/render_frame_host.h"
48 #include "content/public/browser/render_process_host.h" 48 #include "content/public/browser/render_process_host.h"
49 #include "content/public/browser/render_view_host.h" 49 #include "content/public/browser/render_view_host.h"
50 #include "content/public/browser/storage_partition.h"
51 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
52 #include "content/public/common/content_switches.h" 51 #include "content/public/common/content_switches.h"
53 #include "content/public/common/service_names.mojom.h" 52 #include "content/public/common/service_names.mojom.h"
54 #include "content/public/common/url_constants.h" 53 #include "content/public/common/url_constants.h"
55 #include "content/public/common/web_preferences.h" 54 #include "content/public/common/web_preferences.h"
56 #include "device/geolocation/access_token_store.h" 55 #include "device/geolocation/access_token_store.h"
57 #include "device/geolocation/geolocation_delegate.h" 56 #include "device/geolocation/geolocation_delegate.h"
58 #include "net/android/network_library.h" 57 #include "net/android/network_library.h"
59 #include "net/ssl/ssl_cert_request_info.h" 58 #include "net/ssl/ssl_cert_request_info.h"
60 #include "net/ssl/ssl_info.h" 59 #include "net/ssl/ssl_info.h"
61 #include "services/service_manager/public/cpp/interface_registry.h" 60 #include "services/service_manager/public/cpp/interface_registry.h"
62 #include "storage/browser/quota/quota_settings.h"
63 #include "ui/base/resource/resource_bundle.h" 61 #include "ui/base/resource/resource_bundle.h"
64 #include "ui/base/resource/resource_bundle_android.h" 62 #include "ui/base/resource/resource_bundle_android.h"
65 #include "ui/resources/grit/ui_resources.h" 63 #include "ui/resources/grit/ui_resources.h"
66 64
67 #if BUILDFLAG(ENABLE_SPELLCHECK) 65 #if BUILDFLAG(ENABLE_SPELLCHECK)
68 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h" 66 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h"
69 #include "components/spellcheck/common/spellcheck_switches.h" 67 #include "components/spellcheck/common/spellcheck_switches.h"
70 #endif 68 #endif
71 69
72 using content::BrowserThread; 70 using content::BrowserThread;
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 const std::vector<std::pair<int, int> >& render_frames) { 350 const std::vector<std::pair<int, int> >& render_frames) {
353 // Android WebView does not yet support web workers. 351 // Android WebView does not yet support web workers.
354 return false; 352 return false;
355 } 353 }
356 354
357 content::QuotaPermissionContext* 355 content::QuotaPermissionContext*
358 AwContentBrowserClient::CreateQuotaPermissionContext() { 356 AwContentBrowserClient::CreateQuotaPermissionContext() {
359 return new AwQuotaPermissionContext; 357 return new AwQuotaPermissionContext;
360 } 358 }
361 359
362 void AwContentBrowserClient::GetQuotaSettings(
363 content::BrowserContext* context,
364 content::StoragePartition* partition,
365 const storage::OptionalQuotaSettingsCallback& callback) {
366 content::BrowserThread::PostTaskAndReplyWithResult(
367 content::BrowserThread::FILE, FROM_HERE,
368 base::Bind(&storage::CalculateNominalDynamicSettings,
369 partition->GetPath(), context->IsOffTheRecord()),
370 callback);
371 }
372
373 void AwContentBrowserClient::AllowCertificateError( 360 void AwContentBrowserClient::AllowCertificateError(
374 content::WebContents* web_contents, 361 content::WebContents* web_contents,
375 int cert_error, 362 int cert_error,
376 const net::SSLInfo& ssl_info, 363 const net::SSLInfo& ssl_info,
377 const GURL& request_url, 364 const GURL& request_url,
378 ResourceType resource_type, 365 ResourceType resource_type,
379 bool overridable, 366 bool overridable,
380 bool strict_enforcement, 367 bool strict_enforcement,
381 bool expired_previous_decision, 368 bool expired_previous_decision,
382 const base::Callback<void(content::CertificateRequestResultType)>& 369 const base::Callback<void(content::CertificateRequestResultType)>&
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 render_frame_host)); 557 render_frame_host));
571 558
572 // Although WebView does not support password manager feature, renderer code 559 // Although WebView does not support password manager feature, renderer code
573 // could still request this interface, so we register a dummy binder which 560 // could still request this interface, so we register a dummy binder which
574 // just drops the incoming request, to avoid the 'Failed to locate a binder 561 // just drops the incoming request, to avoid the 'Failed to locate a binder
575 // for interface' error log.. 562 // for interface' error log..
576 registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver)); 563 registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver));
577 } 564 }
578 565
579 } // namespace android_webview 566 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/aw_content_browser_client.h ('k') | ash/shell/content/client/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698