Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1639)

Unified Diff: chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm

Issue 11028125: Remove legacy draggable region code and refactor to share common draggable region code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h ('k') | chrome/browser/ui/extensions/native_shell_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698