Initial WebUI extension for enhanced bookmarks

chrome/browser/extensions/component_loader.cc

 // Copyright (c) 2012 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/extensions/component_loader.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 284 matching lines @@
         command_line->GetSwitchValuePath(switches::kImageLoaderExtensionPath));
     Add(IDR_IMAGE_LOADER_MANIFEST, image_loader_extension_path);
     return;
   }
 #endif  // NDEBUG
   Add(IDR_IMAGE_LOADER_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("image_loader")));
 #endif  // defined(IMAGE_LOADER_EXTENSION)
 }
 
+void ComponentLoader::AddBookmarksExtensions() {
+  Add(IDR_BOOKMARKS_MANIFEST,
+      base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
+#if defined(ENABLE_ENHANCED_BOOKMARKS)
+  Add(IDR_ENHANCED_BOOKMARKS_MANIFEST,
+      base::FilePath(FILE_PATH_LITERAL("enhanced_bookmark_manager")));
+#endif
+}
+
 void ComponentLoader::AddWithName(int manifest_resource_id,
                                   const base::FilePath& root_directory,
                                   const std::string& name) {
   std::string manifest_contents =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           manifest_resource_id).as_string();
 
   // The Value is kept for the lifetime of the ComponentLoader. This is
   // required in case LoadAll() is called again.
   base::DictionaryValue* manifest = ParseManifest(manifest_contents);
@@ skipping 52 matching lines @@
   if (browser_defaults::enable_help_app) {
     Add(IDR_HELP_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
                                "/usr/share/chromeos-assets/helpapp")));
   }
 #endif
 
   // Skip all other extensions that require user session presence.
   if (!skip_session_components) {
     const CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (!command_line->HasSwitch(chromeos::switches::kGuestSession))
-      Add(IDR_BOOKMARKS_MANIFEST,
-          base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
+      AddBookmarksExtensions();
 
     Add(IDR_CROSH_BUILTIN_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
         "/usr/share/chromeos-assets/crosh_builtin")));
   }
 #else  // !defined(OS_CHROMEOS)
   DCHECK(!skip_session_components);
-  Add(IDR_BOOKMARKS_MANIFEST,
-      base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
+  AddBookmarksExtensions();
   // Cloud Print component app. Not required on Chrome OS.
   Add(IDR_CLOUDPRINT_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("cloud_print")));
 #endif
 
   if (!skip_session_components) {
     AddWebStoreApp();
     AddChromeApp();
   }
 
@@ skipping 111 matching lines @@
 
 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   delete component->manifest;
   if (extension_service_->is_ready()) {
     extension_service_->
         RemoveComponentExtension(component->extension_id);
   }
 }
 
 }  // namespace extensions