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

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

Issue 2645093003: [WIP] ScreenManager: Add an external window mode (Closed)
Patch Set: Created 3 years, 11 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 return window_server()->display_manager(); 101 return window_server()->display_manager();
102 } 102 }
103 TestWindowServerDelegate* window_server_delegate() { 103 TestWindowServerDelegate* window_server_delegate() {
104 return ws_test_helper_.window_server_delegate(); 104 return ws_test_helper_.window_server_delegate();
105 } 105 }
106 TestScreenManager& screen_manager() { return screen_manager_; } 106 TestScreenManager& screen_manager() { return screen_manager_; }
107 107
108 protected: 108 protected:
109 // testing::Test: 109 // testing::Test:
110 void SetUp() override { 110 void SetUp() override {
111 screen_manager_.Init(window_server()->display_manager()); 111 screen_manager_.Init(window_server()->display_manager(),
112 display::ScreenManager::WINDOW_MODE_INTERNAL);
112 window_server()->user_id_tracker()->AddUserId(kTestId1); 113 window_server()->user_id_tracker()->AddUserId(kTestId1);
113 window_server()->user_id_tracker()->AddUserId(kTestId2); 114 window_server()->user_id_tracker()->AddUserId(kTestId2);
114 } 115 }
115 116
116 private: 117 private:
117 WindowServerTestHelper ws_test_helper_; 118 WindowServerTestHelper ws_test_helper_;
118 TestScreenManager screen_manager_; 119 TestScreenManager screen_manager_;
119 120
120 DISALLOW_COPY_AND_ASSIGN(DisplayTest); 121 DISALLOW_COPY_AND_ASSIGN(DisplayTest);
121 }; 122 };
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 ASSERT_EQ(0u, tree_client->tracker()->changes()->size()); 418 ASSERT_EQ(0u, tree_client->tracker()->changes()->size());
418 419
419 // The window should be destroyed when the client says so. 420 // The window should be destroyed when the client says so.
420 ASSERT_TRUE(tree->DeleteWindow(secondary_root_id)); 421 ASSERT_TRUE(tree->DeleteWindow(secondary_root_id));
421 EXPECT_TRUE(secondary_root_destroyed); 422 EXPECT_TRUE(secondary_root_destroyed);
422 } 423 }
423 424
424 } // namespace test 425 } // namespace test
425 } // namespace ws 426 } // namespace ws
426 } // namespace ui 427 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698