chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm - 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/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm

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/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm ('k') | chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm

diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm

index 8f0bc4e5237a49aa3fbdb4ce814de43f7413ff13..b35ab450d95428ed71b9cf116f0da7caba8e5c5b 100644

--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm

+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm

@@ -48,7 +48,8 @@ class AppShimMenuControllerUITest : public extensions::PlatformAppBrowserTest {

app2_ = CreateAppWindow(extension);

browser1_ = browser()->window();

browser2_ = (new Browser(Browser::CreateParams(

- profile(), chrome::HOST_DESKTOP_TYPE_NATIVE)))->window();

+ profile(), ui::HOST_DESKTOP_TYPE_NATIVE)))

+ ->window();

browser2_->Show();

// Since a pending key status change on any window could cause the test to