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

Unified Diff: chrome/common/chrome_paths.cc

Issue 11318008: cros: Allow default app order to be loaded from an external file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for comments in #1 Created 8 years, 2 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 | « chrome/common/chrome_paths.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index c06c24d9c4d0c29b7d5a1f11e9a1feeab0554982..79867cd50f8013a54c0a3307f1523e4e9fd4fbf9 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -92,6 +92,15 @@ const char kFilepathSinglePrefExtensions[] =
#endif // defined(GOOGLE_CHROME_BUILD)
#endif // defined(OS_LINUX)
+#if defined(OS_CHROMEOS)
+const char kDefaultAppOrderFileName[] =
+#if defined(GOOGLE_CHROME_BUILD)
+ FILE_PATH_LITERAL("/usr/share/google-chrome/default_app_order.json");
+#else
+ FILE_PATH_LITERAL("/usr/share/chromium/default_app_order.json");
+#endif // defined(GOOGLE_CHROME_BUILD)
+#endif // defined(OS_CHROMEOS)
+
} // namespace
namespace chrome {
@@ -367,6 +376,9 @@ bool PathProvider(int key, FilePath* result) {
return false;
cur = cur.Append(FILE_PATH_LITERAL("wallpapers"));
break;
+ case chrome::FILE_DEFAULT_APP_ORDER:
+ cur = FilePath(FILE_PATH_LITERAL(kDefaultAppOrderFileName));
+ break;
#endif
// 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 | « chrome/common/chrome_paths.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698