chrome/browser/ui/ash/launcher/browser_status_monitor.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/ui/ash/launcher/browser_status_monitor.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/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

index 31cffa66c0eb4fb5d422bfee11d9cbfbe53e495a..6cd8b9c33aefa562612fb2696bb815c4a7967eac 100644

--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

@@ -141,7 +141,7 @@ BrowserStatusMonitor::~BrowserStatusMonitor() {

BrowserList::RemoveObserver(this);

BrowserList* browser_list =

- BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);

+ BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);

for (BrowserList::const_iterator i = browser_list->begin();

i != browser_list->end(); ++i) {

OnBrowserRemoved(*i);

@@ -212,7 +212,7 @@ void BrowserStatusMonitor::OnWindowDestroyed(aura::Window* window) {

}

void BrowserStatusMonitor::OnBrowserAdded(Browser* browser) {

- if (browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)

+ if (browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)

return;

if (browser->is_type_popup() && browser->is_app()) {

@@ -226,7 +226,7 @@ void BrowserStatusMonitor::OnBrowserAdded(Browser* browser) {

}

void BrowserStatusMonitor::OnBrowserRemoved(Browser* browser) {

- if (browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)

+ if (browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)

return;

if (browser->is_type_popup() && browser->is_app())

@@ -272,7 +272,7 @@ void BrowserStatusMonitor::ActiveTabChanged(content::WebContents* old_contents,

DCHECK(new_contents);

browser = chrome::FindBrowserWithWebContents(new_contents);

- if (browser && browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)

+ if (browser && browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)

return;

ChromeLauncherController::AppState state =

@@ -301,7 +301,7 @@ void BrowserStatusMonitor::TabReplacedAt(TabStripModel* tab_strip_model,

DCHECK(old_contents && new_contents);

Browser* browser = chrome::FindBrowserWithWebContents(new_contents);

- if (browser && browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)

+ if (browser && browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)

return;

UpdateAppItemState(old_contents,