ash/wm/always_on_top_controller.cc - Issue 101013002: Make sure WindowObservers are removed from window before destruction

Side by Side Diff

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

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

Side by Side Diff: ash/wm/always_on_top_controller.cc

Issue 101013002: Make sure WindowObservers are removed from window before destruction (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cc 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « ash/shell.cc ('k') | ash/wm/resize_shadow_controller.cc » ('j') | ui/aura/window_observer.h » ('J')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/wm/always_on_top_controller.h"	5 #include "ash/wm/always_on_top_controller.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/shell_window_ids.h"	8 #include "ash/shell_window_ids.h"

9 #include "ui/aura/client/aura_constants.h"	9 #include "ui/aura/client/aura_constants.h"

10 #include "ui/aura/window.h"	10 #include "ui/aura/window.h"

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59 window->type() == aura::client::WINDOW_TYPE_POPUP);	59 window->type() == aura::client::WINDOW_TYPE_POPUP);

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

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

62 container->AddChild(window);	62 container->AddChild(window);

63 }	63 }

64 }	64 }

65	65

66 void AlwaysOnTopController::OnWindowDestroyed(aura::Window* window) {	66 void AlwaysOnTopController::OnWindowDestroyed(aura::Window* window) {

67 if (window == always_on_top_container_)	67 if (window == always_on_top_container_)

68 always_on_top_container_ = NULL;	68 always_on_top_container_ = NULL;

	69 aura::WindowObserver::OnWindowDestroyed(window);

69 }	70 }

70	71

71 } // namespace internal	72 } // namespace internal

72 } // namespace ash	73 } // namespace ash

OLD	NEW