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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | « chrome/app/DEPS ('k') | chrome/browser/chromeos/extensions/default_app_order.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index fa1c7c540ab5bb3405c87b5dfef093dd85b893fa..33dc6eff062a96eab3ff8dc1a2addf7bfba3e8f2 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -69,6 +69,7 @@
#if defined(OS_CHROMEOS)
#include "base/sys_info.h"
#include "chrome/browser/chromeos/boot_times_loader.h"
+#include "chromeos/chromeos_paths.h"
#endif
#if defined(OS_ANDROID)
@@ -470,6 +471,9 @@ void ChromeMainDelegate::PreSandboxStartup() {
command_line.GetSwitchValueASCII(switches::kProcessType);
chrome::RegisterPathProvider();
+#if defined(OS_CHROMEOS)
+ chromeos::RegisterPathProvider();
+#endif
#if defined(OS_MACOSX)
// On the Mac, the child executable lives at a predefined location within
« no previous file with comments | « chrome/app/DEPS ('k') | chrome/browser/chromeos/extensions/default_app_order.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698