Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/memory/oom_priority_manager.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/memory/oom_priority_manager.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 134 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   TabStatsList stats_list;
   stats_list.reserve(32);  // 99% of users have < 30 tabs open
 
   // We go through each window to get all the tabs. Depending on the platform,
   // windows are either native or ash or both. We want to make sure to go
   // through them all, starting with the active window first (we use
   // chrome::GetActiveDesktop to get the current used type).
   AddTabStats(BrowserList::GetInstance(chrome::GetActiveDesktop()), true,
               &stats_list);
-  if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_NATIVE) {
-    AddTabStats(BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE),
-                false, &stats_list);
-  } else if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH) {
-    AddTabStats(BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH), false,
+  if (chrome::GetActiveDesktop() != ui::HOST_DESKTOP_TYPE_NATIVE) {
+    AddTabStats(BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE), false,
+                &stats_list);
+  } else if (chrome::GetActiveDesktop() != ui::HOST_DESKTOP_TYPE_ASH) {
+    AddTabStats(BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH), false,
                 &stats_list);
   }
 
   // Sort the data we collected so that least desirable to be
   // killed is first, most desirable is last.
   std::sort(stats_list.begin(), stats_list.end(), CompareTabStats);
   return stats_list;
 }
 
 // TODO(jamescook): This should consider tabs with references to other tabs,
@@ skipping 201 matching lines @@
 }
 
 // This function is called when |update_timer_| fires. It will adjust the clock
 // if needed (if we detect that the machine was asleep) and will fire the stats
 // updating on ChromeOS via the delegate.
 void OomPriorityManager::UpdateTimerCallback() {
   // If we shutting down, do not do anything.
   if (g_browser_process->IsShuttingDown())
     return;
 
-  if (BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH)->empty() &&
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->empty())
+  if (BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH)->empty() &&
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE)->empty())
     return;
 
   // Check for a discontinuity in time caused by the machine being suspended.
   if (!last_adjust_time_.is_null()) {
     TimeDelta suspend_time = TimeTicks::Now() - last_adjust_time_;
     if (suspend_time.InSeconds() > kSuspendThresholdSeconds) {
       // We were probably suspended, move our event timers forward in time so
       // when we subtract them out later we are counting "uptime".
       start_time_ += suspend_time;
       if (!last_discard_time_.is_null())
@@ skipping 58 matching lines @@
   // For the moment we only do something when we reach a critical state.
   if (memory_pressure_level ==
       base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL) {
     LogMemoryAndDiscardTab();
   }
   // TODO(skuhne): If more memory pressure levels are introduced, we might
   // consider to call PurgeBrowserMemory() before CRITICAL is reached.
 }
 
 }  // namespace memory