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

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

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

index 7f722279aafcc2de45f7435d39d61bbbb44e401a..9eac2dc529fa3810143694f2736aacbb86262c29 100644

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

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

@@ -693,7 +693,7 @@ void ChromeLauncherController::LaunchApp(const std::string& app_id,

// The app will be created for the currently active profile.

AppLaunchParams params(

profile_, extension, ui::DispositionFromEventFlags(event_flags),

- chrome::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_APP_LAUNCHER);

+ ui::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_APP_LAUNCHER);

if (source != ash::LAUNCH_FROM_UNKNOWN &&

app_id == extensions::kWebStoreAppId) {

// Get the corresponding source string.

@@ -872,13 +872,13 @@ bool ChromeLauncherController::IsLoggedInAsGuest() {

void ChromeLauncherController::CreateNewWindow() {

// Use the currently active user.

- chrome::NewEmptyWindow(profile_, chrome::HOST_DESKTOP_TYPE_ASH);

+ chrome::NewEmptyWindow(profile_, ui::HOST_DESKTOP_TYPE_ASH);

}

void ChromeLauncherController::CreateNewIncognitoWindow() {

// Use the currently active user.

chrome::NewEmptyWindow(profile_->GetOffTheRecordProfile(),

- chrome::HOST_DESKTOP_TYPE_ASH);

+ ui::HOST_DESKTOP_TYPE_ASH);

}

void ChromeLauncherController::PersistPinnedState() {

@@ -2021,7 +2021,7 @@ void ChromeLauncherController::CloseWindowedAppsFromRemovedExtension(

// This function cannot rely on the controller's enumeration functionality

// since the extension has already be unloaded.

const BrowserList* ash_browser_list =

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

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

std::vector<Browser*> browser_to_close;

for (BrowserList::const_reverse_iterator

it = ash_browser_list->begin_last_active();