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

Side by Side Diff: content/browser/storage_partition_impl.cc

Issue 1224263007: Refactor browser side navigator.connect code to not use MessagePortService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@serviceport-serviceside
Patch Set: fix merge conflict Created 5 years, 4 months 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
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 "content/browser/storage_partition_impl.h" 5 #include "content/browser/storage_partition_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/sequenced_task_runner.h" 11 #include "base/sequenced_task_runner.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "content/browser/browser_main_loop.h" 14 #include "content/browser/browser_main_loop.h"
15 #include "content/browser/fileapi/browser_file_system_helper.h" 15 #include "content/browser/fileapi/browser_file_system_helper.h"
16 #include "content/browser/geofencing/geofencing_manager.h" 16 #include "content/browser/geofencing/geofencing_manager.h"
17 #include "content/browser/gpu/shader_disk_cache.h" 17 #include "content/browser/gpu/shader_disk_cache.h"
18 #include "content/browser/host_zoom_map_impl.h" 18 #include "content/browser/host_zoom_map_impl.h"
19 #include "content/browser/navigator_connect/navigator_connect_context_impl.h" 19 #include "content/browser/navigator_connect/navigator_connect_context_impl.h"
20 #include "content/browser/navigator_connect/navigator_connect_service_worker_ser vice_factory.h"
21 #include "content/browser/notifications/platform_notification_context_impl.h" 20 #include "content/browser/notifications/platform_notification_context_impl.h"
22 #include "content/common/dom_storage/dom_storage_types.h" 21 #include "content/common/dom_storage/dom_storage_types.h"
23 #include "content/public/browser/browser_context.h" 22 #include "content/public/browser/browser_context.h"
24 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
25 #include "content/public/browser/dom_storage_context.h" 24 #include "content/public/browser/dom_storage_context.h"
26 #include "content/public/browser/indexed_db_context.h" 25 #include "content/public/browser/indexed_db_context.h"
27 #include "content/public/browser/local_storage_usage_info.h" 26 #include "content/public/browser/local_storage_usage_info.h"
28 #include "content/public/browser/session_storage_usage_info.h" 27 #include "content/public/browser/session_storage_usage_info.h"
29 #include "net/base/completion_callback.h" 28 #include "net/base/completion_callback.h"
30 #include "net/base/net_errors.h" 29 #include "net/base/net_errors.h"
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 512
514 scoped_refptr<GeofencingManager> geofencing_manager = 513 scoped_refptr<GeofencingManager> geofencing_manager =
515 new GeofencingManager(service_worker_context); 514 new GeofencingManager(service_worker_context);
516 geofencing_manager->Init(); 515 geofencing_manager->Init();
517 516
518 scoped_refptr<HostZoomLevelContext> host_zoom_level_context( 517 scoped_refptr<HostZoomLevelContext> host_zoom_level_context(
519 new HostZoomLevelContext( 518 new HostZoomLevelContext(
520 context->CreateZoomLevelDelegate(partition_path))); 519 context->CreateZoomLevelDelegate(partition_path)));
521 520
522 scoped_refptr<NavigatorConnectContextImpl> navigator_connect_context = 521 scoped_refptr<NavigatorConnectContextImpl> navigator_connect_context =
523 new NavigatorConnectContextImpl(); 522 new NavigatorConnectContextImpl(service_worker_context);
524 navigator_connect_context->AddFactory(make_scoped_ptr(
525 new NavigatorConnectServiceWorkerServiceFactory(service_worker_context)));
526 523
527 scoped_refptr<PlatformNotificationContextImpl> platform_notification_context = 524 scoped_refptr<PlatformNotificationContextImpl> platform_notification_context =
528 new PlatformNotificationContextImpl(path, context, 525 new PlatformNotificationContextImpl(path, context,
529 service_worker_context); 526 service_worker_context);
530 platform_notification_context->Initialize(); 527 platform_notification_context->Initialize();
531 528
532 scoped_refptr<BackgroundSyncContextImpl> background_sync_context = 529 scoped_refptr<BackgroundSyncContextImpl> background_sync_context =
533 new BackgroundSyncContextImpl(); 530 new BackgroundSyncContextImpl();
534 background_sync_context->Init(service_worker_context); 531 background_sync_context->Init(service_worker_context);
535 532
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 net::URLRequestContextGetter* url_request_context) { 936 net::URLRequestContextGetter* url_request_context) {
940 url_request_context_ = url_request_context; 937 url_request_context_ = url_request_context;
941 } 938 }
942 939
943 void StoragePartitionImpl::SetMediaURLRequestContext( 940 void StoragePartitionImpl::SetMediaURLRequestContext(
944 net::URLRequestContextGetter* media_url_request_context) { 941 net::URLRequestContextGetter* media_url_request_context) {
945 media_url_request_context_ = media_url_request_context; 942 media_url_request_context_ = media_url_request_context;
946 } 943 }
947 944
948 } // namespace content 945 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/navigator_connect/service_port_service_impl.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698