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

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

Issue 2345043003: Unify mustash display closing code paths. (Closed)
Patch Set: Rebase. Created 4 years, 3 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/platform_screen.h ('k') | services/ui/display/platform_screen_ozone.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 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_DISPLAY_PLATFORM_SCREEN_OZONE_H_ 5 #ifndef SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
6 #define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_ 6 #define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 19 matching lines...) Expand all
30 public ui::DisplayConfigurator::Observer, 30 public ui::DisplayConfigurator::Observer,
31 public shell::InterfaceFactory<mojom::DisplayController>, 31 public shell::InterfaceFactory<mojom::DisplayController>,
32 public mojom::DisplayController { 32 public mojom::DisplayController {
33 public: 33 public:
34 PlatformScreenOzone(); 34 PlatformScreenOzone();
35 ~PlatformScreenOzone() override; 35 ~PlatformScreenOzone() override;
36 36
37 // PlatformScreen: 37 // PlatformScreen:
38 void AddInterfaces(shell::InterfaceRegistry* registry) override; 38 void AddInterfaces(shell::InterfaceRegistry* registry) override;
39 void Init(PlatformScreenDelegate* delegate) override; 39 void Init(PlatformScreenDelegate* delegate) override;
40 void RequestCloseDisplay(int64_t display_id) override;
40 int64_t GetPrimaryDisplayId() const override; 41 int64_t GetPrimaryDisplayId() const override;
41 42
42 // mojom::DisplayController: 43 // mojom::DisplayController:
43 void ToggleVirtualDisplay() override; 44 void ToggleVirtualDisplay() override;
44 45
45 private: 46 private:
46 // TODO(kylechar): This struct is just temporary until we migrate 47 // TODO(kylechar): This struct is just temporary until we migrate
47 // DisplayManager code out of ash so it can be used here. 48 // DisplayManager code out of ash so it can be used here.
48 struct DisplayInfo { 49 struct DisplayInfo {
49 DisplayInfo(int64_t new_id, const gfx::Rect& new_bounds) 50 DisplayInfo(int64_t new_id, const gfx::Rect& new_bounds)
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 gfx::Point next_display_origin_; 118 gfx::Point next_display_origin_;
118 119
119 mojo::BindingSet<mojom::DisplayController> bindings_; 120 mojo::BindingSet<mojom::DisplayController> bindings_;
120 121
121 DISALLOW_COPY_AND_ASSIGN(PlatformScreenOzone); 122 DISALLOW_COPY_AND_ASSIGN(PlatformScreenOzone);
122 }; 123 };
123 124
124 } // namespace display 125 } // namespace display
125 126
126 #endif // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_ 127 #endif // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
OLDNEW
« no previous file with comments | « services/ui/display/platform_screen.h ('k') | services/ui/display/platform_screen_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698