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

Side by Side Diff: chrome/browser/ui/webui/chrome_url_data_manager_backend.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: Fixed merge Created 8 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 | 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/ui/webui/chrome_url_data_manager_backend.h" 5 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 DCHECK(backend_); 586 DCHECK(backend_);
587 } 587 }
588 588
589 DevToolsJobFactory::~DevToolsJobFactory() {} 589 DevToolsJobFactory::~DevToolsJobFactory() {}
590 590
591 net::URLRequestJob* 591 net::URLRequestJob*
592 DevToolsJobFactory::MaybeCreateJob(net::URLRequest* request) const { 592 DevToolsJobFactory::MaybeCreateJob(net::URLRequest* request) const {
593 if (ShouldLoadFromDisk()) { 593 if (ShouldLoadFromDisk()) {
594 FilePath path; 594 FilePath path;
595 if (IsSupportedURL(request->url(), &path)) 595 if (IsSupportedURL(request->url(), &path))
596 return new net::URLRequestFileJob(request, path); 596 return new net::URLRequestFileJob(
597 request, path, request->context()->network_delegate());
erikwright (departed) 2012/08/15 19:02:03 Perhaps just go ahead and add the network_delegate
shalev 2012/08/15 21:23:41 Done.
597 } 598 }
598 599
599 return new URLRequestChromeJob(request, backend_); 600 return new URLRequestChromeJob(request, backend_);
600 } 601 }
601 602
602 } // namespace 603 } // namespace
603 604
604 net::URLRequestJobFactory::ProtocolHandler* 605 net::URLRequestJobFactory::ProtocolHandler*
605 CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend) { 606 CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend) {
606 return new DevToolsJobFactory(backend); 607 return new DevToolsJobFactory(backend);
607 } 608 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698