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

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

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase 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 (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/common/shell_window_ids.h" 5 #include "ash/public/cpp/shell_window_ids.h"
6 #include "ash/shell.h" 6 #include "ash/shell.h"
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "ash/wm/window_properties.h" 8 #include "ash/wm/window_properties.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/aura/window_event_dispatcher.h" 12 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/wm/core/window_util.h" 13 #include "ui/wm/core/window_util.h"
14 14
15 using aura::Window; 15 using aura::Window;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 ParentWindowInPrimaryRootWindow(w1.get()); 53 ParentWindowInPrimaryRootWindow(w1.get());
54 w1->Show(); 54 w1->Show();
55 wm::ActivateWindow(w1.get()); 55 wm::ActivateWindow(w1.get());
56 56
57 // The window with the transient parent should get added to the same container 57 // The window with the transient parent should get added to the same container
58 // as its transient parent. 58 // as its transient parent.
59 EXPECT_EQ(launcher, w1->parent()); 59 EXPECT_EQ(launcher, w1->parent());
60 } 60 }
61 61
62 } // namespace ash 62 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/session_state_animator_impl_unittest.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698