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

Unified Diff: ui/display/chromeos/display_configurator.h

Issue 2296003002: ABANDONED: chromeos: Resume displays when suspend is cancelled. (Closed)
Patch Set: fix comment Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/fake_power_manager_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/display_configurator.h
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h
index 9fa5b41b987fccc7c31d10713fcacbf0944b6d8b..f3974bf54b4abf94437007c370b481ec14dd1c1e 100644
--- a/ui/display/chromeos/display_configurator.h
+++ b/ui/display/chromeos/display_configurator.h
@@ -175,6 +175,14 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
const std::vector<DisplaySnapshot*>& cached_displays() const {
return cached_displays_;
}
+ bool displays_suspended_for_test() const { return displays_suspended_; }
+
+ void set_state_controller(StateController* controller) {
+ state_controller_ = controller;
+ }
+ void set_mirroring_controller(SoftwareMirroringController* controller) {
+ mirroring_controller_ = controller;
+ }
// Called when an external process no longer needs to control the display
// and Chrome can take control.
@@ -184,13 +192,6 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
// Chrome should relinquish it.
void RelinquishControl(const DisplayControlCallback& callback);
- void set_state_controller(StateController* controller) {
- state_controller_ = controller;
- }
- void set_mirroring_controller(SoftwareMirroringController* controller) {
- mirroring_controller_ = controller;
- }
-
// Replaces |native_display_delegate_| with the delegate passed in and sets
// |configure_display_| to true. Should be called before Init().
void SetDelegateForTesting(
« no previous file with comments | « chromeos/dbus/fake_power_manager_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698