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

Side by Side Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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 | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('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 "chrome/browser/profiles/profile_impl_io_data.h" 5 #include "chrome/browser/profiles/profile_impl_io_data.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "components/prefs/pref_member.h" 53 #include "components/prefs/pref_member.h"
54 #include "components/prefs/pref_service.h" 54 #include "components/prefs/pref_service.h"
55 #include "components/previews/core/previews_io_data.h" 55 #include "components/previews/core/previews_io_data.h"
56 #include "content/public/browser/browser_thread.h" 56 #include "content/public/browser/browser_thread.h"
57 #include "content/public/browser/cookie_store_factory.h" 57 #include "content/public/browser/cookie_store_factory.h"
58 #include "content/public/browser/notification_service.h" 58 #include "content/public/browser/notification_service.h"
59 #include "content/public/browser/resource_context.h" 59 #include "content/public/browser/resource_context.h"
60 #include "content/public/browser/storage_partition.h" 60 #include "content/public/browser/storage_partition.h"
61 #include "extensions/browser/extension_protocols.h" 61 #include "extensions/browser/extension_protocols.h"
62 #include "extensions/common/constants.h" 62 #include "extensions/common/constants.h"
63 #include "extensions/features/features.h"
63 #include "net/base/cache_type.h" 64 #include "net/base/cache_type.h"
64 #include "net/base/sdch_manager.h" 65 #include "net/base/sdch_manager.h"
65 #include "net/cookies/cookie_store.h" 66 #include "net/cookies/cookie_store.h"
66 #include "net/http/http_cache.h" 67 #include "net/http/http_cache.h"
67 #include "net/http/http_network_session.h" 68 #include "net/http/http_network_session.h"
68 #include "net/http/http_server_properties_manager.h" 69 #include "net/http/http_server_properties_manager.h"
69 #include "net/sdch/sdch_owner.h" 70 #include "net/sdch/sdch_owner.h"
70 #include "net/ssl/channel_id_service.h" 71 #include "net/ssl/channel_id_service.h"
71 #include "net/url_request/url_request_context_storage.h" 72 #include "net/url_request/url_request_context_storage.h"
72 #include "net/url_request/url_request_intercepting_job_factory.h" 73 #include "net/url_request/url_request_intercepting_job_factory.h"
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 request_interceptors.begin(), 550 request_interceptors.begin(),
550 data_reduction_proxy_io_data()->CreateInterceptor().release()); 551 data_reduction_proxy_io_data()->CreateInterceptor().release());
551 main_context_storage->set_job_factory(SetUpJobFactoryDefaults( 552 main_context_storage->set_job_factory(SetUpJobFactoryDefaults(
552 std::move(main_job_factory), std::move(request_interceptors), 553 std::move(main_job_factory), std::move(request_interceptors),
553 std::move(profile_params->protocol_handler_interceptor), 554 std::move(profile_params->protocol_handler_interceptor),
554 main_context->network_delegate(), 555 main_context->network_delegate(),
555 io_thread_globals->host_resolver.get())); 556 io_thread_globals->host_resolver.get()));
556 main_context->set_network_quality_estimator( 557 main_context->set_network_quality_estimator(
557 io_thread_globals->network_quality_estimator.get()); 558 io_thread_globals->network_quality_estimator.get());
558 559
559 #if defined(ENABLE_EXTENSIONS) 560 #if BUILDFLAG(ENABLE_EXTENSIONS)
560 InitializeExtensionsRequestContext(profile_params); 561 InitializeExtensionsRequestContext(profile_params);
561 #endif 562 #endif
562 563
563 // Setup SDCH for this profile. 564 // Setup SDCH for this profile.
564 std::unique_ptr<net::SdchManager> sdch_manager(new net::SdchManager()); 565 std::unique_ptr<net::SdchManager> sdch_manager(new net::SdchManager());
565 sdch_policy_.reset(new net::SdchOwner(sdch_manager.get(), main_context)); 566 sdch_policy_.reset(new net::SdchOwner(sdch_manager.get(), main_context));
566 sdch_policy_->EnablePersistentStorage( 567 sdch_policy_->EnablePersistentStorage(
567 std::unique_ptr<net::SdchOwner::PrefStorage>( 568 std::unique_ptr<net::SdchOwner::PrefStorage>(
568 new chrome_browser_net::SdchOwnerPrefStorage( 569 new chrome_browser_net::SdchOwnerPrefStorage(
569 network_json_store_.get()))); 570 network_json_store_.get())));
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 const base::Closure& completion) { 805 const base::Closure& completion) {
805 DCHECK_CURRENTLY_ON(BrowserThread::IO); 806 DCHECK_CURRENTLY_ON(BrowserThread::IO);
806 DCHECK(initialized()); 807 DCHECK(initialized());
807 808
808 DCHECK(transport_security_state()); 809 DCHECK(transport_security_state());
809 // Completes synchronously. 810 // Completes synchronously.
810 transport_security_state()->DeleteAllDynamicDataSince(time); 811 transport_security_state()->DeleteAllDynamicDataSince(time);
811 DCHECK(http_server_properties_manager_); 812 DCHECK(http_server_properties_manager_);
812 http_server_properties_manager_->Clear(completion); 813 http_server_properties_manager_->Clear(completion);
813 } 814 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698