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

Unified Diff: chrome/browser/dom_ui/chrome_url_data_manager.cc

Issue 2817026: Move the files in resources/shared/ into resources.pak (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Rebase after tony's commit Created 10 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/dom_ui/shared_resources_data_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/chrome_url_data_manager.cc
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index a011801d3ac605c5dc165a85fdbfaab566bda95e..c5aad6452c44ec826e1c8f8fc43936e61159cc49 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/appcache/view_appcache_internals_job_factory.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/dom_ui/shared_resources_data_source.h"
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/browser/net/view_http_cache_job_factory.h"
#include "chrome/common/chrome_paths.h"
@@ -98,13 +99,7 @@ void RegisterURLRequestChromeJob() {
chrome::kChromeUIDevToolsHost, inspector_dir);
}
- // Set up the chrome://resources/ source.
- FilePath resources_dir;
- if (PathService::Get(chrome::DIR_SHARED_RESOURCES, &resources_dir)) {
- Singleton<ChromeURLDataManager>()->AddFileSource(
- chrome::kChromeUIResourcesHost, resources_dir);
- }
-
+ SharedResourcesDataSource::Register();
URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme,
&ChromeURLDataManager::Factory);
}
@@ -115,12 +110,6 @@ void UnregisterURLRequestChromeJob() {
Singleton<ChromeURLDataManager>()->RemoveFileSource(
chrome::kChromeUIDevToolsHost);
}
-
- FilePath resources_dir;
- if (PathService::Get(chrome::DIR_SHARED_RESOURCES, &resources_dir)) {
- Singleton<ChromeURLDataManager>()->RemoveFileSource(
- chrome::kChromeUIResourcesHost);
- }
}
// static
« no previous file with comments | « no previous file | chrome/browser/dom_ui/shared_resources_data_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698