| Index: chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
|
| index 70f678c1efc0d148a4832c0a7bc9c06b5ade2024..da9a24937e91bd43ff94facd9a3e3efceac64d5f 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
|
| @@ -583,36 +583,7 @@ void ShellWindowCocoa::UpdateDraggableRegionsForCustomDrag(
|
|
|
| // Aggregate the draggable areas and non-draggable areas such that hit test
|
| // could be performed easily.
|
| - SkRegion* draggable_region = new SkRegion;
|
| - for (std::vector<extensions::DraggableRegion>::const_iterator iter =
|
| - regions.begin();
|
| - iter != regions.end();
|
| - ++iter) {
|
| - const extensions::DraggableRegion& region = *iter;
|
| - draggable_region->op(
|
| - region.bounds.x(),
|
| - region.bounds.y(),
|
| - region.bounds.right(),
|
| - region.bounds.bottom(),
|
| - region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
|
| - }
|
| - draggable_region_.reset(draggable_region);
|
| -}
|
| -
|
| -void ShellWindowCocoa::UpdateLegacyDraggableRegions(
|
| - const std::vector<extensions::DraggableRegion>& regions) {
|
| - // Draggable region is not supported for non-frameless window.
|
| - if (has_frame_)
|
| - return;
|
| -
|
| - system_drag_exclude_areas_.clear();
|
| - for (std::vector<extensions::DraggableRegion>::const_iterator iter =
|
| - regions.begin();
|
| - iter != regions.end();
|
| - ++iter) {
|
| - system_drag_exclude_areas_.push_back(iter->bounds);
|
| - }
|
| - InstallDraggableRegionViews();
|
| + draggable_region_.reset(ShellWindow::RawDraggableRegionsToSkRegion(regions));
|
| }
|
|
|
| void ShellWindowCocoa::HandleKeyboardEvent(
|
|
|