Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Side by Side Diff: ash/mus/disconnected_app_handler.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: move files to ash/shared, fix deps Created 4 years, 2 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/mus/disconnected_app_handler.h" 5 #include "ash/mus/disconnected_app_handler.h"
6 6
7 #include "ash/common/shell_window_ids.h"
8 #include "ash/mus/bridge/wm_window_mus.h" 7 #include "ash/mus/bridge/wm_window_mus.h"
8 #include "ash/shared/shell_window_ids.h"
9 9
10 namespace ash { 10 namespace ash {
11 namespace mus { 11 namespace mus {
12 namespace { 12 namespace {
13 13
14 bool IsContainer(ui::Window* window) { 14 bool IsContainer(ui::Window* window) {
15 return WmWindowMus::Get(window)->IsContainer(); 15 return WmWindowMus::Get(window)->IsContainer();
16 } 16 }
17 17
18 } // namespace 18 } // namespace
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 Remove(params.target); 60 Remove(params.target);
61 61
62 if (params.new_parent == params.receiver && IsContainer(params.new_parent)) 62 if (params.new_parent == params.receiver && IsContainer(params.new_parent))
63 Add(params.target); 63 Add(params.target);
64 64
65 ui::WindowTracker::OnTreeChanging(params); 65 ui::WindowTracker::OnTreeChanging(params);
66 } 66 }
67 67
68 } // namespace mus 68 } // namespace mus
69 } // namespace ash 69 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/container_ids.cc ('k') | ash/mus/property_util.h » ('j') | ash/shared/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698