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

Side by Side Diff: ui/views/mus/screen_mus.h

Issue 1639563003: Renames WindowManagerConfig to FrameDecorationValues and moves to Display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 4 years, 11 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
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 UI_VIEWS_MUS_SCREEN_MUS_H_ 5 #ifndef UI_VIEWS_MUS_SCREEN_MUS_H_
6 #define UI_VIEWS_MUS_SCREEN_MUS_H_ 6 #define UI_VIEWS_MUS_SCREEN_MUS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
11 #include "components/mus/public/interfaces/display.mojom.h" 11 #include "components/mus/public/interfaces/display.mojom.h"
12 #include "mojo/public/cpp/bindings/binding.h" 12 #include "mojo/public/cpp/bindings/binding.h"
13 #include "ui/gfx/display.h" 13 #include "ui/gfx/display.h"
14 #include "ui/gfx/screen.h" 14 #include "ui/gfx/screen.h"
15 #include "ui/views/mus/mus_export.h" 15 #include "ui/views/mus/mus_export.h"
16 16
17 namespace mojo { 17 namespace mojo {
18 class ApplicationImpl; 18 class ApplicationImpl;
19 } 19 }
20 20
21 namespace views { 21 namespace views {
22 22
23 class ScreenMusDelegate;
24
23 // Screen implementation backed by mus::mojom::DisplayManager. 25 // Screen implementation backed by mus::mojom::DisplayManager.
24 class VIEWS_MUS_EXPORT ScreenMus 26 class VIEWS_MUS_EXPORT ScreenMus
25 : public gfx::Screen, 27 : public gfx::Screen,
26 public NON_EXPORTED_BASE(mus::mojom::DisplayManagerObserver) { 28 public NON_EXPORTED_BASE(mus::mojom::DisplayManagerObserver) {
27 public: 29 public:
28 ScreenMus(); 30 explicit ScreenMus(ScreenMusDelegate* delegate);
29 ~ScreenMus() override; 31 ~ScreenMus() override;
30 32
31 void Init(mojo::ApplicationImpl* app); 33 void Init(mojo::ApplicationImpl* app);
32 34
33 private: 35 private:
34 int FindDisplayIndexById(int64_t id) const; 36 int FindDisplayIndexById(int64_t id) const;
35 37
36 // Invoked when a display changed in some weay, including being added. 38 // Invoked when a display changed in some weay, including being added.
37 // If |is_primary| is true, |changed_display| is the primary display. 39 // If |is_primary| is true, |changed_display| is the primary display.
38 void ProcessDisplayChanged(const gfx::Display& changed_display, 40 void ProcessDisplayChanged(const gfx::Display& changed_display,
(...skipping 10 matching lines...) Expand all
49 std::vector<gfx::Display> GetAllDisplays() const override; 51 std::vector<gfx::Display> GetAllDisplays() const override;
50 gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override; 52 gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
51 void AddObserver(gfx::DisplayObserver* observer) override; 53 void AddObserver(gfx::DisplayObserver* observer) override;
52 void RemoveObserver(gfx::DisplayObserver* observer) override; 54 void RemoveObserver(gfx::DisplayObserver* observer) override;
53 55
54 // mus::mojom::DisplayManager: 56 // mus::mojom::DisplayManager:
55 void OnDisplays(mojo::Array<mus::mojom::DisplayPtr> displays) override; 57 void OnDisplays(mojo::Array<mus::mojom::DisplayPtr> displays) override;
56 void OnDisplaysChanged(mojo::Array<mus::mojom::DisplayPtr> display) override; 58 void OnDisplaysChanged(mojo::Array<mus::mojom::DisplayPtr> display) override;
57 void OnDisplayRemoved(int64_t id) override; 59 void OnDisplayRemoved(int64_t id) override;
58 60
61 ScreenMusDelegate* delegate_;
59 mus::mojom::DisplayManagerPtr display_manager_; 62 mus::mojom::DisplayManagerPtr display_manager_;
60 std::vector<gfx::Display> displays_; 63 std::vector<gfx::Display> displays_;
61 int primary_display_index_; 64 int primary_display_index_;
62 mojo::Binding<mus::mojom::DisplayManagerObserver> 65 mojo::Binding<mus::mojom::DisplayManagerObserver>
63 display_manager_observer_binding_; 66 display_manager_observer_binding_;
64 base::ObserverList<gfx::DisplayObserver> observers_; 67 base::ObserverList<gfx::DisplayObserver> observers_;
65 68
66 DISALLOW_COPY_AND_ASSIGN(ScreenMus); 69 DISALLOW_COPY_AND_ASSIGN(ScreenMus);
67 }; 70 };
68 71
69 } // namespace views 72 } // namespace views
70 73
71 #endif // UI_VIEWS_MUS_SCREEN_MUS_H_ 74 #endif // UI_VIEWS_MUS_SCREEN_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698