| Index: ui/display/chromeos/x11/display_util.cc
|
| diff --git a/ui/display/chromeos/x11/display_util.cc b/ui/display/chromeos/x11/display_util.cc
|
| index 72457b1a1d3d60e8c039429deb628770ab5539c8..107d8be5feffa86f6025f1e9ec2b1003c89ccd20 100644
|
| --- a/ui/display/chromeos/x11/display_util.cc
|
| +++ b/ui/display/chromeos/x11/display_util.cc
|
| @@ -62,17 +62,16 @@ OutputType GetOutputTypeFromName(const std::string& name) {
|
| return OUTPUT_TYPE_UNKNOWN;
|
| }
|
|
|
| -std::string GetDisplayName(const OutputConfigurator::OutputSnapshot& output) {
|
| +std::string GetDisplayName(RROutput output) {
|
| std::string display_name;
|
| - GetOutputDeviceData(output.output, NULL, &display_name);
|
| + GetOutputDeviceData(output, NULL, &display_name);
|
| return display_name;
|
| }
|
|
|
| -bool GetOutputOverscanFlag(const OutputConfigurator::OutputSnapshot& output,
|
| - bool* flag) {
|
| +bool GetOutputOverscanFlag(RROutput output, bool* flag) {
|
| unsigned long nitems = 0;
|
| unsigned char* prop = NULL;
|
| - if (!base::GetEDIDProperty(output.output, &nitems, &prop))
|
| + if (!base::GetEDIDProperty(output, &nitems, &prop))
|
| return false;
|
|
|
| bool found = ParseOutputOverscanFlag(prop, nitems, flag);
|
|
|