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

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

Issue 10700117: Replaced static URLRequestFileJob factory with non-static protocol handler for File jobs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed context from file_dir_job, merged with error_job cl Created 8 years, 5 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 | Annotate | Revision Log
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_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 new ProtocolHandlerRegistryInterceptor( 548 new ProtocolHandlerRegistryInterceptor(
549 profile_params_->protocol_handler_registry)); 549 profile_params_->protocol_handler_registry));
550 } 550 }
551 bool set_protocol = job_factory->SetProtocolHandler( 551 bool set_protocol = job_factory->SetProtocolHandler(
552 chrome::kExtensionScheme, 552 chrome::kExtensionScheme,
553 CreateExtensionProtocolHandler(is_incognito(), 553 CreateExtensionProtocolHandler(is_incognito(),
554 profile_params_->extension_info_map)); 554 profile_params_->extension_info_map));
555 DCHECK(set_protocol); 555 DCHECK(set_protocol);
556 set_protocol = job_factory->SetProtocolHandler( 556 set_protocol = job_factory->SetProtocolHandler(
557 chrome::kExtensionResourceScheme, 557 chrome::kExtensionResourceScheme,
558 CreateExtensionResourceProtocolHandler()); 558 CreateExtensionResourceProtocolHandler(network_delegate()));
559 DCHECK(set_protocol); 559 DCHECK(set_protocol);
560 set_protocol = job_factory->SetProtocolHandler( 560 set_protocol = job_factory->SetProtocolHandler(
561 chrome::kChromeUIScheme, 561 chrome::kChromeUIScheme,
562 ChromeURLDataManagerBackend::CreateProtocolHandler( 562 ChromeURLDataManagerBackend::CreateProtocolHandler(
563 chrome_url_data_manager_backend_.get())); 563 chrome_url_data_manager_backend_.get()));
564 DCHECK(set_protocol); 564 DCHECK(set_protocol);
565 set_protocol = job_factory->SetProtocolHandler( 565 set_protocol = job_factory->SetProtocolHandler(
566 chrome::kChromeDevToolsScheme, 566 chrome::kChromeDevToolsScheme,
567 CreateDevToolsProtocolHandler(chrome_url_data_manager_backend_.get())); 567 CreateDevToolsProtocolHandler(chrome_url_data_manager_backend_.get(),
568 network_delegate()));
568 DCHECK(set_protocol); 569 DCHECK(set_protocol);
569 #if defined(OS_CHROMEOS) 570 #if defined(OS_CHROMEOS)
570 if (!is_incognito()) { 571 if (!is_incognito()) {
571 set_protocol = job_factory->SetProtocolHandler( 572 set_protocol = job_factory->SetProtocolHandler(
572 chrome::kDriveScheme, new gdata::GDataProtocolHandler()); 573 chrome::kDriveScheme, new gdata::GDataProtocolHandler());
573 DCHECK(set_protocol); 574 DCHECK(set_protocol);
574 } 575 }
575 #if !defined(GOOGLE_CHROME_BUILD) 576 #if !defined(GOOGLE_CHROME_BUILD)
576 // Install the GView request interceptor that will redirect requests 577 // Install the GView request interceptor that will redirect requests
577 // of compatible documents (PDF, etc) to the GView document viewer. 578 // of compatible documents (PDF, etc) to the GView document viewer.
(...skipping 22 matching lines...) Expand all
600 } 601 }
601 602
602 void ProfileIOData::set_server_bound_cert_service( 603 void ProfileIOData::set_server_bound_cert_service(
603 net::ServerBoundCertService* server_bound_cert_service) const { 604 net::ServerBoundCertService* server_bound_cert_service) const {
604 server_bound_cert_service_.reset(server_bound_cert_service); 605 server_bound_cert_service_.reset(server_bound_cert_service);
605 } 606 }
606 607
607 void ProfileIOData::DestroyResourceContext() { 608 void ProfileIOData::DestroyResourceContext() {
608 resource_context_.reset(); 609 resource_context_.reset();
609 } 610 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698