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

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

Issue 2481263002: Introduce Display Compositor mojo interface. Use InProcessContextProvider. (Closed)
Patch Set: Speculative fix for android build issue 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 #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 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 649
650 private: 650 private:
651 WindowServerTestHelper ws_test_helper_; 651 WindowServerTestHelper ws_test_helper_;
652 // TestWindowTreeClient that is used for the WM client. Owned by 652 // TestWindowTreeClient that is used for the WM client. Owned by
653 // |window_server_delegate_| 653 // |window_server_delegate_|
654 TestWindowTreeClient* wm_client_ = nullptr; 654 TestWindowTreeClient* wm_client_ = nullptr;
655 // Owned by WindowServer 655 // Owned by WindowServer
656 TestDisplayBinding* display_binding_ = nullptr; 656 TestDisplayBinding* display_binding_ = nullptr;
657 // Owned by WindowServer's DisplayManager. 657 // Owned by WindowServer's DisplayManager.
658 Display* display_ = nullptr; 658 Display* display_ = nullptr;
659 scoped_refptr<DisplayCompositor> display_compositor_;
660 659
661 DISALLOW_COPY_AND_ASSIGN(WindowEventTargetingHelper); 660 DISALLOW_COPY_AND_ASSIGN(WindowEventTargetingHelper);
662 }; 661 };
663 662
664 // ----------------------------------------------------------------------------- 663 // -----------------------------------------------------------------------------
665 664
666 // Adds a new WM to |window_server| for |user_id|. Creates 665 // Adds a new WM to |window_server| for |user_id|. Creates
667 // WindowManagerWindowTreeFactory and associated WindowTree for the WM. 666 // WindowManagerWindowTreeFactory and associated WindowTree for the WM.
668 void AddWindowManager(WindowServer* window_server, const UserId& user_id); 667 void AddWindowManager(WindowServer* window_server, const UserId& user_id);
669 668
(...skipping 23 matching lines...) Expand all
693 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id); 692 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
694 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree, 693 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
695 ServerWindow* parent, 694 ServerWindow* parent,
696 ClientWindowId* client_id); 695 ClientWindowId* client_id);
697 696
698 } // namespace test 697 } // namespace test
699 } // namespace ws 698 } // namespace ws
700 } // namespace ui 699 } // namespace ui
701 700
702 #endif // SERVICES_UI_WS_TEST_UTILS_H_ 701 #endif // SERVICES_UI_WS_TEST_UTILS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698