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

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

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 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
« no previous file with comments | « media/gpu/rendering_helper.cc ('k') | services/ui/display/screen_manager_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_SCREEN_MANAGER_OZONE_H_ 5 #ifndef SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
6 #define SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_ 6 #define SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 void OnDisplayRemoved(const Display& old_display) override; 76 void OnDisplayRemoved(const Display& old_display) override;
77 void OnDisplayMetricsChanged(const Display& display, 77 void OnDisplayMetricsChanged(const Display& display,
78 uint32_t changed_metrics) override; 78 uint32_t changed_metrics) override;
79 79
80 // DisplayManager::Delegate: 80 // DisplayManager::Delegate:
81 void CreateOrUpdateMirroringDisplay( 81 void CreateOrUpdateMirroringDisplay(
82 const DisplayInfoList& display_info_list) override; 82 const DisplayInfoList& display_info_list) override;
83 void CloseMirroringDisplayIfNotNecessary() override; 83 void CloseMirroringDisplayIfNotNecessary() override;
84 void PreDisplayConfigurationChange(bool clear_focus) override; 84 void PreDisplayConfigurationChange(bool clear_focus) override;
85 void PostDisplayConfigurationChange(bool must_clear_window) override; 85 void PostDisplayConfigurationChange(bool must_clear_window) override;
86 ui::DisplayConfigurator* display_configurator() override; 86 DisplayConfigurator* display_configurator() override;
87 87
88 // mojo::InterfaceFactory<mojom::DisplayController>: 88 // mojo::InterfaceFactory<mojom::DisplayController>:
89 void Create(const service_manager::Identity& remote_identity, 89 void Create(const service_manager::Identity& remote_identity,
90 mojom::DisplayControllerRequest request) override; 90 mojom::DisplayControllerRequest request) override;
91 91
92 // mojo::InterfaceFactory<mojom::TestDisplayController>: 92 // mojo::InterfaceFactory<mojom::TestDisplayController>:
93 void Create(const service_manager::Identity& remote_identity, 93 void Create(const service_manager::Identity& remote_identity,
94 mojom::TestDisplayControllerRequest request) override; 94 mojom::TestDisplayControllerRequest request) override;
95 95
96 ui::DisplayConfigurator display_configurator_; 96 DisplayConfigurator display_configurator_;
97 std::unique_ptr<DisplayManager> display_manager_; 97 std::unique_ptr<DisplayManager> display_manager_;
98 std::unique_ptr<DisplayChangeObserver> display_change_observer_; 98 std::unique_ptr<DisplayChangeObserver> display_change_observer_;
99 99
100 ScreenBase* screen_ = nullptr; 100 ScreenBase* screen_ = nullptr;
101 ScreenManagerDelegate* delegate_ = nullptr; 101 ScreenManagerDelegate* delegate_ = nullptr;
102 102
103 std::unique_ptr<ui::NativeDisplayDelegate> native_display_delegate_; 103 std::unique_ptr<NativeDisplayDelegate> native_display_delegate_;
104 104
105 // If not null it provides a way to modify the display state when running off 105 // If not null it provides a way to modify the display state when running off
106 // device (eg. running mustash on Linux). 106 // device (eg. running mustash on Linux).
107 FakeDisplayController* fake_display_controller_ = nullptr; 107 FakeDisplayController* fake_display_controller_ = nullptr;
108 108
109 int64_t primary_display_id_ = kInvalidDisplayId; 109 int64_t primary_display_id_ = kInvalidDisplayId;
110 110
111 mojo::BindingSet<mojom::DisplayController> controller_bindings_; 111 mojo::BindingSet<mojom::DisplayController> controller_bindings_;
112 mojo::BindingSet<mojom::TestDisplayController> test_bindings_; 112 mojo::BindingSet<mojom::TestDisplayController> test_bindings_;
113 113
114 DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzone); 114 DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzone);
115 }; 115 };
116 116
117 } // namespace display 117 } // namespace display
118 118
119 #endif // SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_ 119 #endif // SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
OLDNEW
« no previous file with comments | « media/gpu/rendering_helper.cc ('k') | services/ui/display/screen_manager_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698