Make HelpApp component extension.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/background_mode_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_signin.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chrome_blob_storage_context.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/default_apps.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ skipping 329 matching lines @@
 
   // Load any extensions specified with --load-extension.
   if (command_line->HasSwitch(switches::kLoadExtension)) {
     FilePath path = command_line->GetSwitchValuePath(switches::kLoadExtension);
     extensions_service_->LoadExtension(path);
   }
 }
 
 void ProfileImpl::RegisterComponentExtensions() {
   // Register the component extensions.
-  typedef std::list<std::pair<std::string, int> > ComponentExtensionList;
+  typedef std::list<std::pair<FilePath::StringType, int> >
+      ComponentExtensionList;
   ComponentExtensionList component_extensions;
 
   // Bookmark manager.
-  component_extensions.push_back(
-      std::make_pair("bookmark_manager", IDR_BOOKMARKS_MANIFEST));
+  component_extensions.push_back(std::make_pair(
+      FILE_PATH_LITERAL("bookmark_manager"),
+      IDR_BOOKMARKS_MANIFEST));
 
 #if defined(TOUCH_UI)
-  component_extensions.push_back(
-      std::make_pair("keyboard", IDR_KEYBOARD_MANIFEST));
+  component_extensions.push_back(std::make_pair(
+      FILE_PATH_LITERAL("keyboard"),
+      IDR_KEYBOARD_MANIFEST));
+#endif
+
+#if defined(OS_CHROMEOS)
+  if (browser_defaults::enable_help_app) {
+    component_extensions.push_back(std::make_pair(
+        FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"),
+        IDR_HELP_MANIFEST));
+  }
 #endif
 
   // Web Store.
-  component_extensions.push_back(
-      std::make_pair("web_store", IDR_WEBSTORE_MANIFEST));
+  component_extensions.push_back(std::make_pair(
+      FILE_PATH_LITERAL("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()) {
+      if (PathService::Get(chrome::DIR_RESOURCES, &path)) {
+        path = path.Append(iter->first);
+      } else {
+        NOTREACHED();
+      }
     }
 
     std::string manifest =
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             iter->second).as_string();
     extensions_service_->register_component_extension(
         ExtensionService::ComponentExtensionInfo(manifest, path));
   }
 }
 
@@ skipping 978 matching lines @@
 }
 
 PrerenderManager* ProfileImpl::GetPrerenderManager() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (!cl->HasSwitch(switches::kEnablePagePrerender))
     return NULL;
   if (!prerender_manager_)
     prerender_manager_ = new PrerenderManager(this);
   return prerender_manager_;
 }