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

Unified Diff: chrome/browser/ui/webui/about_ui.cc

Issue 11962031: Move a few non-common css files out of chrome\browser\resources\shared\css. This is in anticipation… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | « chrome/browser/resources/shared_resources.grd ('k') | chrome/browser/ui/webui/version_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/about_ui.cc
===================================================================
--- chrome/browser/ui/webui/about_ui.cc (revision 177063)
+++ chrome/browser/ui/webui/about_ui.cc (working copy)
@@ -92,6 +92,7 @@
const char kCreditsJsPath[] = "credits.js";
const char kMemoryJsPath[] = "memory.js";
+const char kMemoryCssPath[] = "about_memory.css";
const char kStatsJsPath[] = "stats.js";
const char kStringsJsPath[] = "strings.js";
@@ -558,9 +559,15 @@
// TODO(jamescook): Maybe this shouldn't update UMA?
handler->StartFetch(MemoryDetails::UPDATE_USER_METRICS);
} else {
- std::string result = ResourceBundle::GetSharedInstance().GetRawDataResource(
- path == kMemoryJsPath ? IDR_ABOUT_MEMORY_JS : IDR_ABOUT_MEMORY_HTML).
- as_string();
+ int id = IDR_ABOUT_MEMORY_HTML;
+ if (path == kMemoryJsPath) {
+ id = IDR_ABOUT_MEMORY_JS;
+ } else if (path == kMemoryCssPath) {
+ id = IDR_ABOUT_MEMORY_CSS;
+ }
+
+ std::string result =
+ ResourceBundle::GetSharedInstance().GetRawDataResource(id).as_string();
callback.Run(base::RefCountedString::TakeString(&result));
}
}
« no previous file with comments | « chrome/browser/resources/shared_resources.grd ('k') | chrome/browser/ui/webui/version_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698