Index: chromeos/display/output_configurator.h |
diff --git a/chromeos/display/output_configurator.h b/chromeos/display/output_configurator.h |
index 5385b71f4922930cead5c771e1fe1a3d1fbcce41..a308a45478833113de3c9b4f98221c87a845ab78 100644 |
--- a/chromeos/display/output_configurator.h |
+++ b/chromeos/display/output_configurator.h |
@@ -55,6 +55,7 @@ class CHROMEOS_EXPORT OutputConfigurator |
RRMode current_mode; |
RRMode native_mode; |
RRMode mirror_mode; |
+ RRMode selected_mode; |
int y; |
int height; |
@@ -114,6 +115,12 @@ class CHROMEOS_EXPORT OutputConfigurator |
// Called when displays are detected. |
virtual OutputState GetStateForDisplayIds( |
const std::vector<int64>& display_ids) const = 0; |
+ |
+ // Queries the resolution (|width|x|height|) in pixels |
+ // to select output mode for the given display id. |
+ virtual bool GetResolutionForDisplayId(int64 display_id, |
+ int* width, |
+ int* height) const = 0; |
}; |
// Interface for classes that implement software based mirroring. |
@@ -159,7 +166,8 @@ class CHROMEOS_EXPORT OutputConfigurator |
// Returns information about the current outputs. |
// This method may block for 60 milliseconds or more. |
- virtual std::vector<OutputSnapshot> GetOutputs() = 0; |
+ virtual std::vector<OutputSnapshot> GetOutputs( |
+ const StateController* state_controller) = 0; |
// Gets details corresponding to |mode|. Parameters may be NULL. |
// Returns true on success. |
@@ -303,14 +311,14 @@ class CHROMEOS_EXPORT OutputConfigurator |
return mirrored_display_area_ratio_map_; |
} |
- private: |
- // Configure outputs. |
- void ConfigureOutputs(); |
- |
// Configure outputs with |kConfigureDelayMs| delay, |
// so that time-consuming ConfigureOutputs() won't be called multiple times. |
void ScheduleConfigureOutputs(); |
+ private: |
+ // Configure outputs. |
+ void ConfigureOutputs(); |
+ |
// Fires OnDisplayModeChanged() event to the observers. |
void NotifyOnDisplayChanged(); |