| Index: chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
|
| index eb8bc2420f413b1def9e7d96dcb1ec7940a3d781..98b39a89e454f0e386505fd9375c347da76e35e4 100644
|
| --- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
|
| @@ -124,9 +124,7 @@ void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
|
| 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 ||
|
| + if (!browser || !launcher_controller()->IsBrowserFromActiveUser(browser) ||
|
| IsSettingsBrowser(browser))
|
| return;
|
|
|
| @@ -346,9 +344,7 @@ BrowserShortcutLauncherItemController::ActivateOrAdvanceToNextBrowser() {
|
| bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
|
| Browser* browser) {
|
| // Only Ash desktop browser windows for the active user are represented.
|
| - if (!browser ||
|
| - !launcher_controller()->IsBrowserFromActiveUser(browser) ||
|
| - browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
|
| + if (!browser || !launcher_controller()->IsBrowserFromActiveUser(browser))
|
| return false;
|
|
|
| // v1 App popup windows with a valid app id have their own icon.
|
|
|