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

Index: chrome/browser/ui/app_list/app_list_view_delegate.cc

diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc

index 7424f830fe251c202e1452a082d5f6c30ce11c40..39d2962fbdad3f7e87868f28bba28174c9172e28 100644

--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc

+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc

@@ -320,9 +320,9 @@ void AppListViewDelegate::SetUpProfileSwitcher() {

return;

// Don't populate the app list users if we are on the ash desktop.

- chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(

+ ui::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(

controller_->GetAppListWindow());

- if (desktop == chrome::HOST_DESKTOP_TYPE_ASH)

+ if (desktop == ui::HOST_DESKTOP_TYPE_ASH)

return;

// Populate the app list users.

@@ -581,7 +581,7 @@ void AppListViewDelegate::OpenSettings() {

}

void AppListViewDelegate::OpenHelp() {

- chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(

+ ui::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(

controller_->GetAppListWindow());

chrome::ScopedTabbedBrowserDisplayer displayer(profile_, desktop);

content::OpenURLParams params(GURL(chrome::kAppLauncherHelpURL),

@@ -593,7 +593,7 @@ void AppListViewDelegate::OpenHelp() {

}

void AppListViewDelegate::OpenFeedback() {

- chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(

+ ui::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(

controller_->GetAppListWindow());

Browser* browser = chrome::FindTabbedBrowser(profile_, false, desktop);

chrome::ShowFeedbackPage(browser, std::string(),

« no previous file with comments | « chrome/browser/ui/app_list/app_list_util.cc ('k') | chrome/browser/ui/ash/accelerator_commands_browsertest.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')