Initial WebUI extension for enhanced bookmarks

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 50518a8019fe0776abe1f7a00318be5e231f4f4c..85c895d21b6143c9bb78e3fdb80c93a6ea2f349f 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -373,9 +373,14 @@ void ComponentLoader::AddDefaultComponentExtensions(
   // 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))
+    if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) {
       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
+    }
 
     Add(IDR_CROSH_BUILTIN_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
         "/usr/share/chromeos-assets/crosh_builtin")));
@@ -384,6 +389,10 @@ void ComponentLoader::AddDefaultComponentExtensions(
   DCHECK(!skip_session_components);
   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
   // Cloud Print component app. Not required on Chrome OS.
   Add(IDR_CLOUDPRINT_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("cloud_print")));