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

Unified Diff: ui/base/ui_base_paths.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/ui_base_paths.h ('k') | ui/test/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base_paths.cc
===================================================================
--- ui/base/ui_base_paths.cc (revision 132528)
+++ ui/base/ui_base_paths.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -32,6 +32,16 @@
#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).
« no previous file with comments | « ui/base/ui_base_paths.h ('k') | ui/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698