summaryrefslogtreecommitdiffstats
path: root/ui/base/ui_base_paths.cc
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-24 02:43:24 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-24 02:43:24 +0000
commit1efbaaa1a43dda420ddb5f96ba765748de0ba5fe (patch)
tree46ad73caa63a44d1aa144554725df4b2e341e559 /ui/base/ui_base_paths.cc
parentd6c0a490893a73cfe28757ba5004c438e9275d96 (diff)
downloadchromium_src-1efbaaa1a43dda420ddb5f96ba765748de0ba5fe.zip
chromium_src-1efbaaa1a43dda420ddb5f96ba765748de0ba5fe.tar.gz
chromium_src-1efbaaa1a43dda420ddb5f96ba765748de0ba5fe.tar.bz2
Metro/HiDPI: Move 1x icons into separate pak file
Currently all 1x art files are repacked into chrome.pak files. This is a problem on Windows where we want to choose which pak file to load based on metro and DPI scale. As a first step this CL does the following: - add a new enable_hidpi build flag. This allows us to test HiDPI mode on Windows Chrome. - stop packing theme_resources_standard.pak and ui_resources_standard.pak into chrome.pak - update the Mac and Windows installer code to package the extra pak files. Note, I'll be updating the Linux installer script in a separate CL. I'm still looking into the ChromeOS situation. BUG=114311 TEST=Ran on Windows, and Mac and Linux. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=132517 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=132760 Review URL: https://chromiumcodereview.appspot.com/10024050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/ui_base_paths.cc')
-rw-r--r--ui/base/ui_base_paths.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc
index 14897f0..fc07a78 100644
--- a/ui/base/ui_base_paths.cc
+++ b/ui/base/ui_base_paths.cc
@@ -32,16 +32,6 @@ bool PathProvider(int key, FilePath* result) {
#endif
create_dir = true;
break;
- case ui::FILE_RESOURCES_PAK:
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
- if (!PathService::Get(base::DIR_EXE, &cur))
- return false;
- // TODO(tony): We shouldn't be referencing chrome here.
- cur = cur.AppendASCII("chrome.pak");
-#else
- NOTREACHED();
-#endif
- break;
// The following are only valid in the development environment, and
// will fail if executed from an installed executable (because the
// generated path won't exist).