| Index: ash/display/display_manager.cc
|
| diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
|
| index 9feca525dd5b3d160331e5abe1c476760200b23d..ac8732de466c46960bd84a6c6be039b3df20e3aa 100644
|
| --- a/ash/display/display_manager.cc
|
| +++ b/ash/display/display_manager.cc
|
| @@ -299,7 +299,7 @@ DisplayLayout DisplayManager::GetCurrentDisplayLayout() {
|
|
|
| DisplayIdPair DisplayManager::GetCurrentDisplayIdPair() const {
|
| if (IsMirrored()) {
|
| - if (software_mirroring_enabled()) {
|
| + if (SoftwareMirroringEnabled()) {
|
| CHECK_EQ(2u, num_connected_displays());
|
| // This comment is to make it easy to distinguish the crash
|
| // between two checks.
|
| @@ -949,7 +949,7 @@ bool DisplayManager::UpdateDisplayBounds(int64 display_id,
|
| if (change_display_upon_host_resize_) {
|
| display_info_[display_id].SetBounds(new_bounds);
|
| // Don't notify observers if the mirrored window has changed.
|
| - if (software_mirroring_enabled() && mirrored_display_id_ == display_id)
|
| + if (SoftwareMirroringEnabled() && mirrored_display_id_ == display_id)
|
| return false;
|
| gfx::Display* display = FindDisplayForId(display_id);
|
| display->SetSize(display_info_[display_id].size_in_pixel());
|
| @@ -989,7 +989,7 @@ gfx::Display* DisplayManager::FindDisplayForId(int64 id) {
|
|
|
| void DisplayManager::AddMirrorDisplayInfoIfAny(
|
| std::vector<DisplayInfo>* display_info_list) {
|
| - if (software_mirroring_enabled() && IsMirrored())
|
| + if (SoftwareMirroringEnabled() && IsMirrored())
|
| display_info_list->push_back(GetDisplayInfo(mirrored_display_id_));
|
| }
|
|
|
|
|