chrome/browser/extensions/api/bookmarks/bookmarks_api.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/extensions/api/bookmarks/bookmarks_api.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/download/download_crx_util.cc ('k') | chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

index 3d64ad40cb66f4dceaad57f69505317743ed740a..fedb2e02cda46f3bfaad884b858cafe38133ab81 100644

--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

@@ -792,8 +792,7 @@ void BookmarksIOFunction::ShowSelectFileDialog(

platform_util::GetTopLevel(web_contents->GetNativeView())

: NULL;

#if defined(OS_WIN)

- if (!owning_window &&

- chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)

+ if (!owning_window && chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH)

owning_window = aura::RemoteWindowTreeHostWin::Instance()->GetAshWindow();

#endif

// |web_contents| can be NULL (for background pages), which is fine. In such