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

Side by Side Diff: services/ui/ws/test_utils.h

Issue 2481263002: Introduce Display Compositor mojo interface. Use InProcessContextProvider. (Closed)
Patch Set: Make ContextProvider NON_EXPORTED_BASE of InProcessContextProvider Created 4 years, 1 month 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 #ifndef SERVICES_UI_WS_TEST_UTILS_H_ 5 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
6 #define SERVICES_UI_WS_TEST_UTILS_H_ 6 #define SERVICES_UI_WS_TEST_UTILS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 645
646 private: 646 private:
647 WindowServerTestHelper ws_test_helper_; 647 WindowServerTestHelper ws_test_helper_;
648 // TestWindowTreeClient that is used for the WM client. Owned by 648 // TestWindowTreeClient that is used for the WM client. Owned by
649 // |window_server_delegate_| 649 // |window_server_delegate_|
650 TestWindowTreeClient* wm_client_ = nullptr; 650 TestWindowTreeClient* wm_client_ = nullptr;
651 // Owned by WindowServer 651 // Owned by WindowServer
652 TestDisplayBinding* display_binding_ = nullptr; 652 TestDisplayBinding* display_binding_ = nullptr;
653 // Owned by WindowServer's DisplayManager. 653 // Owned by WindowServer's DisplayManager.
654 Display* display_ = nullptr; 654 Display* display_ = nullptr;
655 scoped_refptr<DisplayCompositor> display_compositor_;
656 655
657 DISALLOW_COPY_AND_ASSIGN(WindowEventTargetingHelper); 656 DISALLOW_COPY_AND_ASSIGN(WindowEventTargetingHelper);
658 }; 657 };
659 658
660 // ----------------------------------------------------------------------------- 659 // -----------------------------------------------------------------------------
661 660
662 // Adds a new WM to |window_server| for |user_id|. Creates 661 // Adds a new WM to |window_server| for |user_id|. Creates
663 // WindowManagerWindowTreeFactory and associated WindowTree for the WM. 662 // WindowManagerWindowTreeFactory and associated WindowTree for the WM.
664 void AddWindowManager(WindowServer* window_server, const UserId& user_id); 663 void AddWindowManager(WindowServer* window_server, const UserId& user_id);
665 664
(...skipping 23 matching lines...) Expand all
689 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id); 688 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
690 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree, 689 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
691 ServerWindow* parent, 690 ServerWindow* parent,
692 ClientWindowId* client_id); 691 ClientWindowId* client_id);
693 692
694 } // namespace test 693 } // namespace test
695 } // namespace ws 694 } // namespace ws
696 } // namespace ui 695 } // namespace ui
697 696
698 #endif // SERVICES_UI_WS_TEST_UTILS_H_ 697 #endif // SERVICES_UI_WS_TEST_UTILS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698