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

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

Issue 697493002: Support transition between chrome and user mode console (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: upload again Created 6 years, 1 month 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
Index: ui/display/chromeos/display_configurator.h
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h
index f4b10d0904ef92503900df84e4b489193e162be2..dc600374d0c0dc625ad640a749647f2afc3aae5b 100644
--- a/ui/display/chromeos/display_configurator.h
+++ b/ui/display/chromeos/display_configurator.h
@@ -145,6 +145,8 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
return cached_displays_;
}
+ void RelinquishControl();
+
void set_state_controller(StateController* controller) {
state_controller_ = controller;
}
@@ -312,6 +314,10 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
SoftwareMirroringController* mirroring_controller_;
scoped_ptr<NativeDisplayDelegate> native_display_delegate_;
+ // True when the display is controlled by an entity outside
+ // of chrome (ie frecon).
+ bool display_externally_controlled_;
+
// Used to enable modes which rely on panel fitting.
bool is_panel_fitting_enabled_;

Powered by Google App Engine
This is Rietveld 408576698