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

Index: chrome/browser/ui/ash/chrome_shell_delegate.cc

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

index abd0dd78234542ed49f1a38bdf23286d10fae756..8b8698e6699ea6c5c650fabd6a1ddbaed418f6f7 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -172,11 +172,11 @@ base::string16 ChromeShellDelegate::GetProductName() const {

void ChromeShellDelegate::OpenKeyboardShortcutHelpPage() const {

Profile* profile = ProfileManager::GetActiveUserProfile();

Browser* browser =

- chrome::FindTabbedBrowser(profile, false, chrome::HOST_DESKTOP_TYPE_ASH);

+ chrome::FindTabbedBrowser(profile, false, ui::HOST_DESKTOP_TYPE_ASH);

if (!browser) {

- browser = new Browser(

- Browser::CreateParams(profile, chrome::HOST_DESKTOP_TYPE_ASH));

+ browser =

+ new Browser(Browser::CreateParams(profile, ui::HOST_DESKTOP_TYPE_ASH));

browser->window()->Activate();

browser->window()->Show();

}