Remove host_desktop_type() from browser.h

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_model.h"
 #include "ash/shelf/shelf_util.h"
@@ skipping 104 matching lines @@
 
   if (browser_status != browser_item.status) {
     browser_item.status = browser_status;
     model->Set(browser_index, browser_item);
   }
 }
 
 void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
+#if !defined(USE_ASH)

[sky, 2016/03/15 23:52:56]

Why are we compiling this file if not ash?

[scottmg, 2016/03/16 01:21:48]

Oops, good point. Done.

+  return;
+#endif  // USE_ASH
   // 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;
 
   ash::SetShelfIDForWindow(
       launcher_controller()->GetShelfIDForWebContents(web_contents),
       browser->window()->GetNativeWindow());
 }
 
 bool BrowserShortcutLauncherItemController::IsOpen() const {
   const BrowserList* browser_list = BrowserList::GetInstance();
@@ skipping 199 matching lines @@
   }
   DCHECK(browser);
   browser->window()->Show();
   browser->window()->Activate();
   return kExistingWindowActivated;
 }
 
 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 !defined(USE_ASH)
+  return;
+#endif
+  if (!browser || !launcher_controller()->IsBrowserFromActiveUser(browser))
     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;
 
   // Settings browsers have their own icon.
   if (IsSettingsBrowser(browser))
     return false;
 
   // Tabbed browser and other popup windows are all represented.
   return true;
 }