chrome/browser/memory/oom_priority_manager.cc - Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/memory/oom_priority_manager.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl

Patch Set: Fix build on Mac and CrOS Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/lifetime/browser_close_manager_browsertest.cc ('k') | chrome/browser/metro_utils/metro_chrome_win.h » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/memory/oom_priority_manager.cc

diff --git a/chrome/browser/memory/oom_priority_manager.cc b/chrome/browser/memory/oom_priority_manager.cc

index 2a1621b049be23aee8ecc6c1c90b192a65ff48db..c597dcb9b59fe7287bf053b403709a96e6106d54 100644

--- a/chrome/browser/memory/oom_priority_manager.cc

+++ b/chrome/browser/memory/oom_priority_manager.cc

@@ -152,11 +152,11 @@ TabStatsList OomPriorityManager::GetTabStats() {

// 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);

}

@@ -378,8 +378,8 @@ void OomPriorityManager::UpdateTimerCallback() {

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.