ash/wm/system_modal_container_layout_manager.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: ash/wm/system_modal_container_layout_manager.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: ash/wm/system_modal_container_layout_manager.cc

diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc

index 2c2cdebb57a5f4df3af517287b2815eeae7e2c8c..eaf3cdf083502a96577c674f36cdd8825abff66d 100644

--- a/ash/wm/system_modal_container_layout_manager.cc

+++ b/ash/wm/system_modal_container_layout_manager.cc

@@ -63,8 +63,8 @@ void SystemModalContainerLayoutManager::OnWindowResized() {

void SystemModalContainerLayoutManager::OnWindowAddedToLayout(

aura::Window* child) {

DCHECK((modal_background_ && child == modal_background_->GetNativeView()) ||

- child->type() == aura::client::WINDOW_TYPE_NORMAL ||

- child->type() == aura::client::WINDOW_TYPE_POPUP);

+ child->type() == ui::wm::WINDOW_TYPE_NORMAL ||

+ child->type() == ui::wm::WINDOW_TYPE_POPUP);

DCHECK(

container_->id() != internal::kShellWindowId_LockSystemModalContainer ||

Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked());