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

Side by Side Diff: services/ui/ws/focus_controller_unittest.cc

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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 | « services/ui/ws/focus_controller_observer.h ('k') | services/ui/ws/ids.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/mus/ws/focus_controller.h" 5 #include "services/ui/ws/focus_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "components/mus/ws/focus_controller_delegate.h" 11 #include "services/ui/ws/focus_controller_delegate.h"
12 #include "components/mus/ws/focus_controller_observer.h" 12 #include "services/ui/ws/focus_controller_observer.h"
13 #include "components/mus/ws/server_window.h" 13 #include "services/ui/ws/server_window.h"
14 #include "components/mus/ws/test_server_window_delegate.h" 14 #include "services/ui/ws/test_server_window_delegate.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace mus { 17 namespace mus {
18 18
19 namespace ws { 19 namespace ws {
20 namespace { 20 namespace {
21 21
22 const char kDisallowActiveChildren[] = "disallow-active-children"; 22 const char kDisallowActiveChildren[] = "disallow-active-children";
23 23
24 class TestFocusControllerObserver : public FocusControllerObserver, 24 class TestFocusControllerObserver : public FocusControllerObserver,
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 EXPECT_EQ(&child_second, focus_observer.new_active_window()); 303 EXPECT_EQ(&child_second, focus_observer.new_active_window());
304 focus_observer.ClearAll(); 304 focus_observer.ClearAll();
305 305
306 focus_controller.ActivateNextWindow(); 306 focus_controller.ActivateNextWindow();
307 EXPECT_EQ(&child_second, focus_observer.old_active_window()); 307 EXPECT_EQ(&child_second, focus_observer.old_active_window());
308 EXPECT_EQ(&parent, focus_observer.new_active_window()); 308 EXPECT_EQ(&parent, focus_observer.new_active_window());
309 } 309 }
310 310
311 } // namespace ws 311 } // namespace ws
312 } // namespace mus 312 } // namespace mus
OLDNEW
« no previous file with comments | « services/ui/ws/focus_controller_observer.h ('k') | services/ui/ws/ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698