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

Side by Side Diff: services/ui/display/screen_manager_forwarding.h

Issue 2829733002: mus: Changes SetDisplayRoot() to create actual display (Closed)
Patch Set: unnecessary get Created 3 years, 8 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/display/screen_manager.h ('k') | services/ui/display/screen_manager_forwarding.cc » ('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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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_DISPLAY_SCREEN_MANAGER_FORWARDING_H_ 5 #ifndef SERVICES_UI_DISPLAY_SCREEN_MANAGER_FORWARDING_H_
6 #define SERVICES_UI_DISPLAY_SCREEN_MANAGER_FORWARDING_H_ 6 #define SERVICES_UI_DISPLAY_SCREEN_MANAGER_FORWARDING_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <unordered_map> 9 #include <unordered_map>
10 #include <vector> 10 #include <vector>
(...skipping 18 matching lines...) Expand all
29 public mojom::NativeDisplayDelegate, 29 public mojom::NativeDisplayDelegate,
30 service_manager::InterfaceFactory<mojom::NativeDisplayDelegate> { 30 service_manager::InterfaceFactory<mojom::NativeDisplayDelegate> {
31 public: 31 public:
32 ScreenManagerForwarding(); 32 ScreenManagerForwarding();
33 ~ScreenManagerForwarding() override; 33 ~ScreenManagerForwarding() override;
34 34
35 // ScreenManager: 35 // ScreenManager:
36 void AddInterfaces(service_manager::BinderRegistry* registry) override; 36 void AddInterfaces(service_manager::BinderRegistry* registry) override;
37 void Init(ScreenManagerDelegate* delegate) override; 37 void Init(ScreenManagerDelegate* delegate) override;
38 void RequestCloseDisplay(int64_t display_id) override; 38 void RequestCloseDisplay(int64_t display_id) override;
39 display::ScreenBase* GetScreen() override;
39 40
40 // NativeDisplayObserver: 41 // NativeDisplayObserver:
41 void OnConfigurationChanged() override; 42 void OnConfigurationChanged() override;
42 void OnDisplaySnapshotsInvalidated() override; 43 void OnDisplaySnapshotsInvalidated() override;
43 44
44 // mojom::NativeDisplayDelegate: 45 // mojom::NativeDisplayDelegate:
45 void Initialize(mojom::NativeDisplayObserverPtr observer) override; 46 void Initialize(mojom::NativeDisplayObserverPtr observer) override;
46 void TakeDisplayControl(const TakeDisplayControlCallback& callback) override; 47 void TakeDisplayControl(const TakeDisplayControlCallback& callback) override;
47 void RelinquishDisplayControl( 48 void RelinquishDisplayControl(
48 const RelinquishDisplayControlCallback& callback) override; 49 const RelinquishDisplayControlCallback& callback) override;
(...skipping 24 matching lines...) Expand all
73 const std::vector<DisplaySnapshot*>& displays); 74 const std::vector<DisplaySnapshot*>& displays);
74 75
75 // Forwards results from call to Configure() back with |callback|. 76 // Forwards results from call to Configure() back with |callback|.
76 void ForwardConfigure( 77 void ForwardConfigure(
77 DisplaySnapshot* snapshot, 78 DisplaySnapshot* snapshot,
78 const DisplayMode* mode, 79 const DisplayMode* mode,
79 const gfx::Point& origin, 80 const gfx::Point& origin,
80 const mojom::NativeDisplayDelegate::ConfigureCallback& callback, 81 const mojom::NativeDisplayDelegate::ConfigureCallback& callback,
81 bool status); 82 bool status);
82 83
84 std::unique_ptr<display::ScreenBase> screen_;
83 mojo::Binding<mojom::NativeDisplayDelegate> binding_; 85 mojo::Binding<mojom::NativeDisplayDelegate> binding_;
84 mojom::NativeDisplayObserverPtr observer_; 86 mojom::NativeDisplayObserverPtr observer_;
85 87
86 std::unique_ptr<display::NativeDisplayDelegate> native_display_delegate_; 88 std::unique_ptr<display::NativeDisplayDelegate> native_display_delegate_;
87 89
88 // Cached pointers to snapshots owned by the |native_display_delegate_|. 90 // Cached pointers to snapshots owned by the |native_display_delegate_|.
89 std::unordered_map<int64_t, DisplaySnapshot*> snapshot_map_; 91 std::unordered_map<int64_t, DisplaySnapshot*> snapshot_map_;
90 92
91 DISALLOW_COPY_AND_ASSIGN(ScreenManagerForwarding); 93 DISALLOW_COPY_AND_ASSIGN(ScreenManagerForwarding);
92 }; 94 };
93 95
94 } // namespace display 96 } // namespace display
95 97
96 #endif // SERVICES_UI_DISPLAY_SCREEN_MANAGER_FORWARDING_H_ 98 #endif // SERVICES_UI_DISPLAY_SCREEN_MANAGER_FORWARDING_H_
OLDNEW
« no previous file with comments | « services/ui/display/screen_manager.h ('k') | services/ui/display/screen_manager_forwarding.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698