Revise about: and chrome: url handling.

chrome/browser/extensions/extension_install_ui.cc

 // Copyright (c) 2011 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_install_ui.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 26 matching lines @@
 
 // Shows the application install animation on the new tab page for the app
 // with |app_id|. If a NTP already exists on the active |browser|, this will
 // select that tab and show the animation there. Otherwise, it will create
 // a new NTP.
 void ShowAppInstalledAnimation(Browser* browser, const std::string& app_id) {
   // Select an already open NTP, if there is one. Existing NTPs will
   // automatically show the install animation for any new apps.
   for (int i = 0; i < browser->tab_count(); ++i) {
     GURL url = browser->GetTabContentsAt(i)->GetURL();
-    if (web_ui_util::ChromeURLHostEquals(url, chrome::kChromeUINewTabHost)) {
+    if (url.SchemeIs(chrome::kChromeUIScheme) &&
+        url.host() == chrome::kChromeUINewTabHost) {
       browser->ActivateTabAt(i, false);
       return;
     }
   }
 
   // If there isn't an NTP, open one and pass it the ID of the installed app.
   std::string url = base::StringPrintf(
       "%s#app-id=%s", chrome::kChromeUINewTabURL, app_id.c_str());
   browser->AddSelectedTabWithURL(GURL(url), PageTransition::TYPED);
 }
@@ skipping 190 matching lines @@
 
 InfoBarDelegate* ExtensionInstallUI::GetNewThemeInstalledInfoBarDelegate(
     TabContents* tab_contents,
     const Extension* new_theme,
     const std::string& previous_theme_id,
     bool previous_using_native_theme) {
   return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme,
                                            previous_theme_id,
                                            previous_using_native_theme);
 }