diff --git a/atom/browser/api/atom_api_browser_window_mac.mm b/atom/browser/api/atom_api_browser_window_mac.mm index 95c6c43e826c..46cabd5062e7 100644 --- a/atom/browser/api/atom_api_browser_window_mac.mm +++ b/atom/browser/api/atom_api_browser_window_mac.mm @@ -80,30 +80,24 @@ void BrowserWindow::UpdateDraggableRegions( // Draggable regions is implemented by having the whole web view draggable // (mouseDownCanMoveWindow) and overlaying regions that are not draggable. draggable_regions_ = regions; - std::vector system_drag_exclude_areas; + std::vector drag_exclude_rects; if (regions.empty()) { - system_drag_exclude_areas.push_back( - gfx::Rect(0, 0, webViewWidth, webViewHeight)); + drag_exclude_rects.push_back(gfx::Rect(0, 0, webViewWidth, webViewHeight)); } else { - system_drag_exclude_areas = CalculateNonDraggableRegions( + drag_exclude_rects = CalculateNonDraggableRegions( DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight); } if (window_->browser_view()) - window_->browser_view()->UpdateDraggableRegions(system_drag_exclude_areas); + window_->browser_view()->UpdateDraggableRegions(drag_exclude_rects); // Create and add a ControlRegionView for each region that needs to be // excluded from the dragging. - for (std::vector::const_iterator iter = - system_drag_exclude_areas.begin(); - iter != system_drag_exclude_areas.end(); - ++iter) { + for (const auto& rect : drag_exclude_rects) { base::scoped_nsobject controlRegion( [[ControlRegionView alloc] initWithFrame:NSZeroRect]); - [controlRegion setFrame:NSMakeRect(iter->x(), - webViewHeight - iter->bottom(), - iter->width(), - iter->height())]; + [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(), + rect.width(), rect.height())]; [webView addSubview:controlRegion]; } diff --git a/atom/browser/native_browser_view_mac.mm b/atom/browser/native_browser_view_mac.mm index 9634f20f9828..1bb73e788362 100644 --- a/atom/browser/native_browser_view_mac.mm +++ b/atom/browser/native_browser_view_mac.mm @@ -194,7 +194,7 @@ void NativeBrowserViewMac::SetBackgroundColor(SkColor color) { } void NativeBrowserViewMac::UpdateDraggableRegions( - const std::vector& system_drag_exclude_areas) { + const std::vector& drag_exclude_rects) { NSView* webView = GetInspectableWebContentsView()->GetNativeView(); NSInteger superViewHeight = NSHeight([webView.superview bounds]); @@ -230,15 +230,13 @@ void NativeBrowserViewMac::UpdateDraggableRegions( webViewHeight)]; // Then, on top of that, add "exclusion zones" - for (auto iter = system_drag_exclude_areas.begin(); - iter != system_drag_exclude_areas.end(); - ++iter) { + for (const auto& rect : drag_exclude_rects) { base::scoped_nsobject controlRegion( [[ExcludeDragRegionView alloc] initWithFrame:NSZeroRect]); - [controlRegion setFrame:NSMakeRect(iter->x() - webViewX, - webViewHeight - iter->bottom() + webViewY, - iter->width(), - iter->height())]; + [controlRegion setFrame:NSMakeRect(rect.x() - webViewX, + webViewHeight - rect.bottom() + webViewY, + rect.width(), + rect.height())]; [dragRegion addSubview:controlRegion]; }