Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 7913da19f7dfc92f7e79be86df78b6c48cf28fe9..7fe0d15f73050c491b8456dcc00394e99a50b57c 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -389,17 +389,24 @@ void ProfileImpl::RegisterComponentExtensions() { |
std::make_pair("keyboard", IDR_KEYBOARD_MANIFEST)); |
#endif |
+#if defined(OS_CHROMEOS) |
+ component_extensions.push_back(std::make_pair( |
+ "/usr/share/chromeos-assets/helpapp", IDR_HELP_MANIFEST)); |
+#endif |
+ |
// Web Store. |
component_extensions.push_back( |
std::make_pair("web_store", IDR_WEBSTORE_MANIFEST)); |
for (ComponentExtensionList::iterator iter = component_extensions.begin(); |
iter != component_extensions.end(); ++iter) { |
- FilePath path; |
- if (PathService::Get(chrome::DIR_RESOURCES, &path)) { |
- path = path.AppendASCII(iter->first); |
- } else { |
- NOTREACHED(); |
+ FilePath path(iter->first); |
+ if (!path.IsAbsolute()) { |
Aaron Boodman
2010/12/13 16:29:43
Why this change? It seems if anything, we should C
Dmitry Polukhin
2010/12/13 19:52:38
As you can see from the code all other component e
Aaron Boodman
2010/12/13 20:06:43
Ah.
|
+ if (PathService::Get(chrome::DIR_RESOURCES, &path)) { |
+ path = path.AppendASCII(iter->first); |
+ } else { |
+ NOTREACHED(); |
+ } |
} |
std::string manifest = |