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..70392e0bfbf9e9f23240b40408ceb8576db5f059 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -373,9 +373,15 @@ 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 (CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kEnableEnhancedBookmarks)) {
+        Add(IDR_ENHANCED_BOOKMARKS_MANIFEST,
+            base::FilePath(FILE_PATH_LITERAL("enhanced_bookmark_manager")));
+      }
+    }
 
     Add(IDR_CROSH_BUILTIN_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
         "/usr/share/chromeos-assets/crosh_builtin")));
@@ -384,6 +390,11 @@ void ComponentLoader::AddDefaultComponentExtensions(
   DCHECK(!skip_session_components);
   Add(IDR_BOOKMARKS_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableEnhancedBookmarks)) {
+    Add(IDR_ENHANCED_BOOKMARKS_MANIFEST,
+        base::FilePath(FILE_PATH_LITERAL("enhanced_bookmark_manager")));
+  }

[not at google - send to devlin, 2013/10/01 00:21:01]

you could move both the normal and the enhanced extension registration to a
method.

[Mike Wittman, 2013/10/01 17:56:06]

Done.

   // Cloud Print component app. Not required on Chrome OS.
   Add(IDR_CLOUDPRINT_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("cloud_print")));