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

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

index 44776feb31370046e4d08d971113f81ed61ca670..c0f73568cd09b9009e01c5f022a49ab554a49293 100644

--- a/ash/wm/always_on_top_controller.cc

+++ b/ash/wm/always_on_top_controller.cc

@@ -55,8 +55,8 @@ void AlwaysOnTopController::OnWindowPropertyChanged(aura::Window* window,

const void* key,

intptr_t old) {

if (key == aura::client::kAlwaysOnTopKey) {

- DCHECK(window->type() == aura::client::WINDOW_TYPE_NORMAL ||

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

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

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

aura::Window* container = GetContainer(window);

if (window->parent() != container)

container->AddChild(window);

« no previous file with comments | « ash/test/test_shelf_item_delegate.cc ('k') | ash/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »