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

Unified Diff: ui/base/resource/resource_bundle_linux.cc

Issue 10103022: Revert 132517 - Metro/HiDPI: Move 1x icons into separate pak file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « ui/base/resource/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_linux.cc
===================================================================
--- ui/base/resource/resource_bundle_linux.cc (revision 132528)
+++ ui/base/resource/resource_bundle_linux.cc (working copy)
@@ -7,23 +7,12 @@
#include "base/path_service.h"
#include "ui/base/ui_base_paths.h"
-namespace {
-
-FilePath GetResourcesPakFilePath(const std::string& pak_name) {
- FilePath path;
- if (PathService::Get(base::DIR_MODULE, &path))
- return path.AppendASCII(pak_name.c_str());
- return FilePath();
-}
-
-} // namespace
-
namespace ui {
void ResourceBundle::LoadCommonResources() {
- AddDataPack(GetResourcesPakFilePath("chrome.pak"));
- AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
+ FilePath path;
+ PathService::Get(ui::FILE_RESOURCES_PAK, &path);
+ AddDataPack(path);
}
} // namespace ui
« no previous file with comments | « ui/base/resource/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698