summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-24 00:21:26 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-24 00:21:26 +0000
commit828912619a537bf7a33a36c2441d922a7639bc9b (patch)
tree6c49122fa2a1d04ba8b3b65705bd6fbf23b3d34e /chrome/browser/dom_ui
parented1ff5e175dbc151aa7999e2c7b79a82c8ff7052 (diff)
downloadchromium_src-828912619a537bf7a33a36c2441d922a7639bc9b.zip
chromium_src-828912619a537bf7a33a36c2441d922a7639bc9b.tar.gz
chromium_src-828912619a537bf7a33a36c2441d922a7639bc9b.tar.bz2
Implement extension:// protocol.
Review URL: http://codereview.chromium.org/15010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/chrome_url_data_manager.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 623ad8d..940ed68 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -83,7 +83,7 @@ class URLRequestChromeJob : public URLRequestJob {
// URLRequestChromeFileJob is a URLRequestJob that acts like a file:// URL
class URLRequestChromeFileJob : public URLRequestFileJob {
public:
- URLRequestChromeFileJob(URLRequest* request, const std::wstring& path);
+ URLRequestChromeFileJob(URLRequest* request, const FilePath& path);
virtual ~URLRequestChromeFileJob();
private:
@@ -244,7 +244,8 @@ URLRequestJob* ChromeURLDataManager::Factory(URLRequest* request,
// Try first with a file handler
std::wstring path;
if (ChromeURLDataManager::URLToFilePath(request->url(), &path))
- return new URLRequestChromeFileJob(request, path);
+ return new URLRequestChromeFileJob(request,
+ FilePath::FromWStringHack(path));
// Fall back to using a custom handler
return new URLRequestChromeJob(request);
@@ -329,10 +330,8 @@ void URLRequestChromeJob::StartAsync() {
}
URLRequestChromeFileJob::URLRequestChromeFileJob(URLRequest* request,
- const std::wstring& path)
- : URLRequestFileJob(request) {
- // set URLRequestFileJob::file_path_
- this->file_path_ = FilePath::FromWStringHack(path);
+ const FilePath& path)
+ : URLRequestFileJob(request, path) {
}
URLRequestChromeFileJob::~URLRequestChromeFileJob() { }