diff options
Diffstat (limited to 'ash')
-rw-r--r-- | ash/display/display_info.cc | 4 | ||||
-rw-r--r-- | ash/display/display_manager.cc | 2 | ||||
-rw-r--r-- | ash/system/chromeos/tray_display.cc | 6 | ||||
-rw-r--r-- | ash/wm/resize_handle_window_targeter.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ash/display/display_info.cc b/ash/display/display_info.cc index 54380aa..b074803 100644 --- a/ash/display/display_info.cc +++ b/ash/display/display_info.cc @@ -305,7 +305,7 @@ void DisplayInfo::Copy(const DisplayInfo& native_info) { // cleared, or has non empty insts. if (native_info.clear_overscan_insets()) overscan_insets_in_dip_.Set(0, 0, 0, 0); - else if (!native_info.overscan_insets_in_dip_.empty()) + else if (!native_info.overscan_insets_in_dip_.IsEmpty()) overscan_insets_in_dip_ = native_info.overscan_insets_in_dip_; rotations_ = native_info.rotations_; @@ -338,7 +338,7 @@ float DisplayInfo::GetEffectiveUIScale() const { void DisplayInfo::UpdateDisplaySize() { size_in_pixel_ = bounds_in_native_.size(); - if (!overscan_insets_in_dip_.empty()) { + if (!overscan_insets_in_dip_.IsEmpty()) { gfx::Insets insets_in_pixel = overscan_insets_in_dip_.Scale(device_scale_factor_); size_in_pixel_.Enlarge(-insets_in_pixel.width(), -insets_in_pixel.height()); diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc index e4643208..14c7383 100644 --- a/ash/display/display_manager.cc +++ b/ash/display/display_manager.cc @@ -313,7 +313,7 @@ void DisplayManager::SetOverscanInsets(int64 display_id, for (const auto& display : active_display_list_) { DisplayInfo info = GetDisplayInfo(display.id()); if (info.id() == display_id) { - if (insets_in_dip.empty()) { + if (insets_in_dip.IsEmpty()) { info.set_clear_overscan_insets(true); } else { info.set_clear_overscan_insets(false); diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc index f8a0157..32714d4 100644 --- a/ash/system/chromeos/tray_display.cc +++ b/ash/system/chromeos/tray_display.cc @@ -209,11 +209,11 @@ class DisplayView : public ActionableView { display_manager->GetDisplayInfo(external_id); if (display_info.GetActiveRotation() != gfx::Display::ROTATE_0 || display_info.configured_ui_scale() != 1.0f || - !display_info.overscan_insets_in_dip().empty()) { + !display_info.overscan_insets_in_dip().IsEmpty()) { name = l10n_util::GetStringFUTF16( IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME, name, GetDisplaySize(external_id)); - } else if (display_info.overscan_insets_in_dip().empty() && + } else if (display_info.overscan_insets_in_dip().IsEmpty() && display_info.has_overscan()) { name = l10n_util::GetStringFUTF16( IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME, @@ -268,7 +268,7 @@ class DisplayView : public ActionableView { GetDisplayManager()->first_display_id()); return display_info.GetActiveRotation() != gfx::Display::ROTATE_0 || display_info.configured_ui_scale() != 1.0f || - !display_info.overscan_insets_in_dip().empty() || + !display_info.overscan_insets_in_dip().IsEmpty() || display_info.has_overscan(); } diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc index 8ee6924..4ef1abc 100644 --- a/ash/wm/resize_handle_window_targeter.cc +++ b/ash/wm/resize_handle_window_targeter.cc @@ -70,7 +70,7 @@ aura::Window* ResizeHandleWindowTargeter::FindTargetForLocatedEvent( insets = frame_border_inset_; } - if (!insets.empty()) { + if (!insets.IsEmpty()) { gfx::Rect bounds = gfx::Rect(window_->bounds().size()); bounds.Inset(insets); if (!bounds.Contains(event->location())) |