ash/wm/always_on_top_controller.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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 unified diff | Download patch

« no previous file with comments | « ash/wallpaper/wallpaper_widget_controller.cc ('k') | ash/wm/always_on_top_controller_unittest.cc » ('j') | no next file with comments »

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/common/wm_window.h"

7 #include "ash/public/cpp/shell_window_ids.h"	8 #include "ash/public/cpp/shell_window_ids.h"

8 #include "ash/wm/workspace/workspace_layout_manager.h"	9 #include "ash/wm/workspace/workspace_layout_manager.h"

9 #include "ash/wm_window.h"

10 #include "base/memory/ptr_util.h"	10 #include "base/memory/ptr_util.h"

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

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

13	13

14 namespace ash {	14 namespace ash {

15	15

16 AlwaysOnTopController::AlwaysOnTopController(WmWindow* viewport)	16 AlwaysOnTopController::AlwaysOnTopController(WmWindow* viewport)

17 : always_on_top_container_(viewport) {	17 : always_on_top_container_(viewport) {

18 DCHECK_NE(kShellWindowId_DefaultContainer, viewport->GetShellWindowId());	18 DCHECK_NE(kShellWindowId_DefaultContainer, viewport->GetShellWindowId());

19 always_on_top_container_->SetLayoutManager(	19 always_on_top_container_->SetLayoutManager(

(...skipping 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 }	69 }

70	70

71 void AlwaysOnTopController::OnWindowDestroying(aura::Window* window) {	71 void AlwaysOnTopController::OnWindowDestroying(aura::Window* window) {

72 if (WmWindow::Get(window) == always_on_top_container_) {	72 if (WmWindow::Get(window) == always_on_top_container_) {

73 always_on_top_container_->aura_window()->RemoveObserver(this);	73 always_on_top_container_->aura_window()->RemoveObserver(this);

74 always_on_top_container_ = nullptr;	74 always_on_top_container_ = nullptr;

75 }	75 }

76 }	76 }

77	77

78 } // namespace ash	78 } // namespace ash

OLD	NEW