Test IsSettingsBrowser in BrowserShortcutLauncherItemController

chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc

 // Copyright (c) 2013 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/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 
 #include <vector>
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_model.h"
@@ skipping 21 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/image/image.h"
 #include "ui/wm/core/window_animations.h"
 
+namespace {
+
+bool IsSettingsBrowser(Browser* browser) {
+  // Normally this test is sufficient. TODO(stevenjb): Replace this with a
+  // better mechanism (Settings WebUI or Browser type).
+  if (chrome::IsTrustedPopupWindowWithScheme(browser, content::kChromeUIScheme))
+    return true;
+  // If a settings window navigates away from a kChromeUIScheme (e.g. after a
+  // crash), the above may not be true, so also test against the known list
+  // of settings browsers (which will not be valid during chrome::Navigate
+  // which is why we still need the above test).
+  if (chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(browser))
+    return true;
+  return false;
+}
+
+}  // namespace
+
 BrowserShortcutLauncherItemController::BrowserShortcutLauncherItemController(
     ChromeLauncherController* launcher_controller)
     : LauncherItemController(TYPE_SHORTCUT,
                              extension_misc::kChromeAppId,
                              launcher_controller) {
 }
 
 BrowserShortcutLauncherItemController::
     ~BrowserShortcutLauncherItemController() {
 }
@@ skipping 50 matching lines @@
 }
 
 void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   // We need to call SetShelfIDForWindow for V1 applications since they are
   // content which might change and as such change the application type.
   if (!browser ||
       !launcher_controller()->IsBrowserFromActiveUser(browser) ||
       browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH ||
-      chrome::IsTrustedPopupWindowWithScheme(browser, content::kChromeUIScheme))
+      IsSettingsBrowser(browser))
     return;
 
   ash::SetShelfIDForWindow(
       launcher_controller()->GetShelfIDForWebContents(web_contents),
       browser->window()->GetNativeWindow());
 }
 
 bool BrowserShortcutLauncherItemController::IsOpen() const {
   const BrowserList* ash_browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
@@ skipping 219 matching lines @@
       browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
     return false;
 
   // v1 App popup windows with a valid app id have their own icon.
   if (browser->is_app() &&
       browser->is_type_popup() &&
       launcher_controller()->GetShelfIDForAppID(
           web_app::GetExtensionIdFromApplicationName(browser->app_name())) > 0)
     return false;
 
-  // Stand-alone chrome:// windows (e.g. settings) have their own icon.
-  if (chrome::IsTrustedPopupWindowWithScheme(browser, content::kChromeUIScheme))
+  // Settings browsers have their own icon.
+  if (IsSettingsBrowser(browser))
     return false;
 
   // Tabbed browser and other popup windows are all represented.
   return true;
 }