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

Side by Side Diff: ui/base/resource/resource_bundle_linux.cc

Issue 10024050: Metro/HiDPI: Move 1x icons into separate pak file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/base/resource/resource_bundle.h" 5 #include "ui/base/resource/resource_bundle.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "ui/base/ui_base_paths.h" 8 #include "ui/base/ui_base_paths.h"
9 9
10 namespace {
11
12 FilePath GetResourcesPakFilePath(const std::string& pak_name) {
13 FilePath path;
14 if (PathService::Get(base::DIR_MODULE, &path))
15 return path.AppendASCII(pak_name.c_str());
16 return FilePath();
17 }
18
19 } // namespace
20
10 namespace ui { 21 namespace ui {
11 22
12 void ResourceBundle::LoadCommonResources() { 23 void ResourceBundle::LoadCommonResources() {
13 FilePath path; 24 AddDataPack(GetResourcesPakFilePath("chrome.pak"));
14 PathService::Get(ui::FILE_RESOURCES_PAK, &path); 25 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
15 AddDataPack(path); 26 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
16 } 27 }
17 28
18 } // namespace ui 29 } // namespace ui
OLDNEW
« 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