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

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

Issue 2503923003: Demonstrate external-window-mode in mus-demo (Closed)
Patch Set: Determine external window mode in mus-ws based on if a WM is connected Created 4 years 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 return window_server()->display_manager(); 102 return window_server()->display_manager();
103 } 103 }
104 TestWindowServerDelegate* window_server_delegate() { 104 TestWindowServerDelegate* window_server_delegate() {
105 return ws_test_helper_.window_server_delegate(); 105 return ws_test_helper_.window_server_delegate();
106 } 106 }
107 TestPlatformScreen& platform_screen() { return platform_screen_; } 107 TestPlatformScreen& platform_screen() { return platform_screen_; }
108 108
109 protected: 109 protected:
110 // testing::Test: 110 // testing::Test:
111 void SetUp() override { 111 void SetUp() override {
112 platform_screen_.Init(window_server()->display_manager()); 112 platform_screen_.Init(window_server()->display_manager(), false);
113 window_server()->user_id_tracker()->AddUserId(kTestId1); 113 window_server()->user_id_tracker()->AddUserId(kTestId1);
114 window_server()->user_id_tracker()->AddUserId(kTestId2); 114 window_server()->user_id_tracker()->AddUserId(kTestId2);
115 } 115 }
116 116
117 private: 117 private:
118 WindowServerTestHelper ws_test_helper_; 118 WindowServerTestHelper ws_test_helper_;
119 TestPlatformScreen platform_screen_; 119 TestPlatformScreen platform_screen_;
120 120
121 DISALLOW_COPY_AND_ASSIGN(DisplayTest); 121 DISALLOW_COPY_AND_ASSIGN(DisplayTest);
122 }; 122 };
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 ASSERT_EQ(0u, tree_client->tracker()->changes()->size()); 418 ASSERT_EQ(0u, tree_client->tracker()->changes()->size());
419 419
420 // The window should be destroyed when the client says so. 420 // The window should be destroyed when the client says so.
421 ASSERT_TRUE(tree->DeleteWindow(secondary_root_id)); 421 ASSERT_TRUE(tree->DeleteWindow(secondary_root_id));
422 EXPECT_TRUE(secondary_root_destroyed); 422 EXPECT_TRUE(secondary_root_destroyed);
423 } 423 }
424 424
425 } // namespace test 425 } // namespace test
426 } // namespace ws 426 } // namespace ws
427 } // namespace ui 427 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698