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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 5758002: Make HelpApp component extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments resolved Created 10 years 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
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 =

Powered by Google App Engine
This is Rietveld 408576698