ui/views/widget/desktop_aura/desktop_root_window_host_win.cc - Issue 115153002: wm: public window_types.

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: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

Issue 115153002: wm: public window_types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ozone deps Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

index de0ae61087d276912b38f184595a964bb212fd3b..76733d0ec3889f43103430f9727d021974a4bbba 100644

--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

@@ -162,7 +162,7 @@ void DesktopRootWindowHostWin::OnRootWindowCreated(

root_window_->window()->SetProperty(kDesktopRootWindowHostKey, this);

should_animate_window_close_ =

- content_window_->type() != aura::client::WINDOW_TYPE_NORMAL &&

+ content_window_->type() != ui::wm::WINDOW_TYPE_NORMAL &&

!views::corewm::WindowAnimationsDisabled(content_window_);

// TODO this is not invoked *after* Init(), but should be ok.