Initial WebUI extension for enhanced bookmarks

chrome/browser/extensions/extension_web_ui.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/extension_web_ui.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 159 matching lines @@
       kExtensionURLOverrides,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // static
 bool ExtensionWebUI::HandleChromeURLOverride(
     GURL* url, content::BrowserContext* browser_context) {
   if (!url->SchemeIs(chrome::kChromeUIScheme))
     return false;
 
+  const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+  if (!browser_command_line.HasSwitch(switches::kEnableDomDistiller) &&
+      url->host() == chrome::kChromeUIEnhancedBookmarksHost)

[Evan Stade, 2013/10/01 17:35:26]

nit: curlies

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

I'll remove this change entirely since we don't need it yet.

+    *url = GURL(chrome::kChromeUIBookmarksURL);
+
   Profile* profile = Profile::FromBrowserContext(browser_context);
   const base::DictionaryValue* overrides =
       profile->GetPrefs()->GetDictionary(kExtensionURLOverrides);
   std::string page = url->host();
   const base::ListValue* url_list = NULL;
   if (!overrides || !overrides->GetList(page, &url_list))
     return false;
 
   ExtensionService* service = profile->GetExtensionService();
 
@@ skipping 227 matching lines @@
             extensions::ImageLoader::ImageRepresentation::ALWAYS_RESIZE,
             gfx::Size(pixel_size, pixel_size),
             scale_factors[i]));
   }
 
   // LoadImagesAsync actually can run callback synchronously. We want to force
   // async.
   extensions::ImageLoader::Get(profile)->LoadImagesAsync(
       extension, info_list, base::Bind(&RunFaviconCallbackAsync, callback));
 }