Make HelpApp component extension.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 371 matching lines @@
 
   // Bookmark manager.
   component_extensions.push_back(
       std::make_pair("bookmark_manager", IDR_BOOKMARKS_MANIFEST));
 
 #if defined(TOUCH_UI)
   component_extensions.push_back(
       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 CHECK that we never get a
relative path, not silently ignore them.

[Dmitry Polukhin, 2010/12/13 19:52:38]

As you can see from the code all other component extensions uses relative paths
to resource dir that is added as prefix in this loop. If the path is already
full, don't add resource dir as prefix.

[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 =
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             iter->second).as_string();
     extensions_service_->register_component_extension(
         ExtensionsService::ComponentExtensionInfo(manifest, path));
   }
 }
 
@@ skipping 942 matching lines @@
 }
 
 PrerenderManager* ProfileImpl::GetPrerenderManager() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (!cl->HasSwitch(switches::kEnablePagePrerender))
     return NULL;
   if (!prerender_manager_.get())
     prerender_manager_.reset(new PrerenderManager(this));
   return prerender_manager_.get();
 }