chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.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/views/apps/chrome_native_app_window_views_aura.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/views/apps/app_info_dialog/app_info_footer_panel.cc ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc

index 2adfb24ed68646ce6501c379c1d03ecd05eb41cb..e5d5fa41bdf19492b0ffbac0becbe890fdbcd0d2 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc

@@ -131,7 +131,7 @@ void ChromeNativeAppWindowViewsAura::InitializeWindow(

// Restore docked state on ash desktop and ignore it elsewhere.

if (create_params.state == ui::SHOW_STATE_DOCKED &&

chrome::GetHostDesktopTypeForNativeWindow(widget()->GetNativeWindow()) ==

- chrome::HOST_DESKTOP_TYPE_ASH) {

+ ui::HOST_DESKTOP_TYPE_ASH) {

widget()->GetNativeWindow()->SetProperty(aura::client::kShowStateKey,

create_params.state);

}

@@ -199,7 +199,7 @@ ChromeNativeAppWindowViewsAura::CreateNonStandardAppFrame() {

// For non-Ash windows, install an easy resize window targeter, which ensures

// that the root window (not the app) receives mouse events on the edges.

if (chrome::GetHostDesktopTypeForNativeWindow(widget()->GetNativeWindow()) !=

- chrome::HOST_DESKTOP_TYPE_ASH) {

+ ui::HOST_DESKTOP_TYPE_ASH) {

aura::Window* window = widget()->GetNativeWindow();

int resize_inside = frame->resize_inside_bounds_size();

gfx::Insets inset(resize_inside, resize_inside, resize_inside,