Remove kDefaultHostDesktopType from browser_finder.cc.

chrome/browser/ui/browser_finder.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/ui/browser_finder.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/navigation_controller.h"
 
 using content::WebContents;
 
 namespace {
 
-// TODO(mad) eventually move this to host_desktop_type.h.
-#if defined(OS_CHROMEOS)
-chrome::HostDesktopType kDefaultHostDesktopType = chrome::HOST_DESKTOP_TYPE_ASH;
-#else
-chrome::HostDesktopType kDefaultHostDesktopType =
-    chrome::HOST_DESKTOP_TYPE_NATIVE;
-#endif
-
 
 // Type used to indicate to match anything.
 const int kMatchAny                     = 0;
 
 // See BrowserMatches for details.
 const int kMatchOriginalProfile         = 1 << 0;
 const int kMatchCanSupportWindowFeature = 1 << 1;
 const int kMatchTabbed                  = 1 << 2;
 
 // Returns true if the specified |browser| matches the specified arguments.
@@ skipping 160 matching lines @@
 
 size_t GetTotalBrowserCount() {
   size_t count = 0;
   for (HostDesktopType t = HOST_DESKTOP_TYPE_FIRST; t < HOST_DESKTOP_TYPE_COUNT;
        t = static_cast<HostDesktopType>(t + 1)) {
     count += BrowserList::GetInstance(t)->size();
   }
   return count;
 }
 
-size_t GetBrowserCount(Profile* profile) {
-  return GetBrowserCountImpl(profile, kDefaultHostDesktopType, kMatchAny);
+size_t GetTotalBrowserCountForProfile(Profile* profile) {
+  size_t count = 0;
+  for (HostDesktopType t = HOST_DESKTOP_TYPE_FIRST; t < HOST_DESKTOP_TYPE_COUNT;
+       t = static_cast<HostDesktopType>(t + 1)) {
+    count += GetBrowserCount(profile, t);
+  }
+  return count;
 }
 
-size_t GetTabbedBrowserCount(Profile* profile) {
-  return GetBrowserCountImpl(profile, kDefaultHostDesktopType, kMatchTabbed);
+size_t GetBrowserCount(Profile* profile, HostDesktopType type) {
+  return GetBrowserCountImpl(profile, type, kMatchAny);
+}
+
+size_t GetTabbedBrowserCount(Profile* profile, HostDesktopType type) {
+  return GetBrowserCountImpl(profile, type, kMatchTabbed);
 }
 
 }  // namespace chrome