chrome/browser/ui/browser_command_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/browser_command_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

Index: chrome/browser/ui/browser_command_controller.cc

diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc

index abb123388f0c36b7d5397e6fb790a9d34ad81506..9009e8e9e48585e41d0664b9cb18bff22a94c6a0 100644

--- a/chrome/browser/ui/browser_command_controller.cc

+++ b/chrome/browser/ui/browser_command_controller.cc

@@ -889,7 +889,7 @@ void BrowserCommandController::InitCommandState() {

command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB, true);

UpdateTabRestoreCommandState();

#if defined(OS_WIN) && defined(USE_ASH)

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

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

command_updater_.UpdateCommandEnabled(IDC_EXIT, true);

#else

command_updater_.UpdateCommandEnabled(IDC_EXIT, true);

@@ -1008,7 +1008,7 @@ void BrowserCommandController::InitCommandState() {

command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window);

command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window);

#if defined(OS_WIN)

- bool metro = browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH;

+ bool metro = browser_->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH;

command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_ENABLE, metro);

command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_DISABLE, metro);

int restart_mode = metro ? IDC_WIN_DESKTOP_RESTART :

« no previous file with comments | « chrome/browser/ui/browser_close_unittest.cc ('k') | chrome/browser/ui/browser_commands.h » ('j') | ui/gfx/host_desktop_type.h » ('J')