Chromium Code Reviews| Index: ui/display/chromeos/configure_displays_task.cc |
| diff --git a/ui/display/chromeos/configure_displays_task.cc b/ui/display/chromeos/configure_displays_task.cc |
| index 17f1a12e8bf247e17cc01bce1415fbe3bbe5fe4c..5e50f9bb951d73e699679c8e711ad31a2bc4919d 100644 |
| --- a/ui/display/chromeos/configure_displays_task.cc |
| +++ b/ui/display/chromeos/configure_displays_task.cc |
| @@ -6,6 +6,7 @@ |
| #include "base/auto_reset.h" |
| #include "base/bind.h" |
| +#include "ui/display/chromeos/display_util.h" |
| #include "ui/display/types/display_snapshot.h" |
| #include "ui/display/types/native_display_delegate.h" |
| @@ -74,9 +75,15 @@ void ConfigureDisplaysTask::Run() { |
| size_t index = pending_request_indexes_.front(); |
| DisplayConfigureRequest* request = &requests_[index]; |
| pending_request_indexes_.pop(); |
| - delegate_->Configure(*request->display, request->mode, request->origin, |
| - base::Bind(&ConfigureDisplaysTask::OnConfigured, |
| - weak_ptr_factory_.GetWeakPtr(), index)); |
| + // Non-native displays do not require configuration through the |
| + // NativeDisplayDelegate |
|
achuithb
2015/02/11 23:41:44
period
|
| + if (!IsNativeDisplay(request->display->type())) { |
| + OnConfigured(index, true); |
| + } else { |
| + delegate_->Configure(*request->display, request->mode, request->origin, |
| + base::Bind(&ConfigureDisplaysTask::OnConfigured, |
| + weak_ptr_factory_.GetWeakPtr(), index)); |
| + } |
| } |
| } |