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 355 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))
+    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")));
   }
 #else  // !defined(OS_CHROMEOS)
   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")));
 #endif
 
   if (!skip_session_components) {
     AddWebStoreApp();
     AddChromeApp();
   }
 
@@ skipping 110 matching lines @@
 
 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   delete component->manifest;
   if (extension_service_->is_ready()) {
     extension_service_->
         RemoveComponentExtension(component->extension_id);
   }
 }
 
 }  // namespace extensions