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

Unified Diff: app/app_paths.cc

Issue 155425: Mac-ify the app-based extensions folder name.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/app_paths.cc
===================================================================
--- app/app_paths.cc (revision 20481)
+++ app/app_paths.cc (working copy)
@@ -18,12 +18,16 @@
FilePath cur;
switch (key) {
+#if !defined(OS_MACOSX)
Mark Mentovai 2009/07/13 16:15:21 Nobody will ever ask for DIR_THEMES on the Mac?
Avi (use Gerrit) 2009/07/13 16:33:53 They don't now, and if they start to, it'll be pre
+ // These are not "themes" that are user-created, but rather the dlls and
+ // pak files. On the Mac, we keep the pak files in the lproj folders.
case app::DIR_THEMES:
if (!PathService::Get(base::DIR_MODULE, &cur))
return false;
cur = cur.Append(FILE_PATH_LITERAL("themes"));
create_dir = true;
break;
+#endif
case app::DIR_LOCALES:
if (!PathService::Get(base::DIR_MODULE, &cur))
return false;
@@ -40,8 +44,16 @@
case app::DIR_EXTERNAL_EXTENSIONS:
if (!PathService::Get(base::DIR_MODULE, &cur))
return false;
+#if defined(OS_MACOSX)
Mark Mentovai 2009/07/13 16:15:21 Do we support multiple extensions dirs?
Avi (use Gerrit) 2009/07/13 16:33:53 This is for extensions that ship with the app; thi
+ // On Mac, built-in extensions are in Contents/Extensions, a sibling of
+ // the App dir. If there are none, it may not exist.
+ cur = cur.DirName();
+ cur = cur.Append(FILE_PATH_LITERAL("Extensions"));
+ create_dir = false;
+#else
cur = cur.Append(FILE_PATH_LITERAL("extensions"));
create_dir = true;
+#endif
break;
// The following are only valid in the development environment, and
// will fail if executed from an installed executable (because the
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698