Remove legacy draggable region code and refactor to share common draggable region code

chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h"
 
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
-#include "third_party/skia/include/core/SkRegion.h"
 
 @interface NSWindow (NSPrivateApis)
 - (void)setBottomCornerRounded:(BOOL)rounded;
 @end
 
 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 
 @interface NSWindow (LionSDKDeclarations)
@@ skipping 129 matching lines @@
   return self;
 }
 
 - (BOOL)mouseDownCanMoveWindow {
   return NO;
 }
 
 - (NSView*)hitTest:(NSPoint)aPoint {
   if (shellWindow_->use_system_drag())
     return nil;
-  if (!shellWindow_->draggable_region() ||
-      !shellWindow_->draggable_region()->contains(aPoint.x, aPoint.y)) {
+  if (!shellWindow_->IsInsideDraggableRegions(aPoint.x, aPoint.y))
     return nil;
-  }
   return self;
 }
 
 - (void)mouseDown:(NSEvent*)event {
   shellWindow_->HandleMouseEvent(event);
 }
 
 - (void)mouseDragged:(NSEvent*)event {
   shellWindow_->HandleMouseEvent(event);
 }
 
 @end
 
 @interface NSView (WebContentsView)
 - (void)setMouseDownCanMoveWindow:(BOOL)can_move;
 @end
 
 ShellWindowCocoa::ShellWindowCocoa(ShellWindow* shell_window,
                                    const ShellWindow::CreateParams& params)
-    : shell_window_(shell_window),
-      has_frame_(params.frame == ShellWindow::CreateParams::FRAME_CHROME),
+    : NativeShellWindow(params),
+      shell_window_(shell_window),
       attention_request_id_(0),
       use_system_drag_(true) {
   // Flip coordinates based on the primary screen.
   NSRect main_screen_rect = [[[NSScreen screens] objectAtIndex:0] frame];
   NSRect cocoa_bounds = NSMakeRect(params.bounds.x(),
       NSHeight(main_screen_rect) - params.bounds.y() - params.bounds.height(),
       params.bounds.width(), params.bounds.height());
 
   // If coordinates are < 0, center window on primary screen
   if (params.bounds.x() < 0) {
     cocoa_bounds.origin.x =
         (NSWidth(main_screen_rect) - NSWidth(cocoa_bounds)) / 2;
   }
   if (params.bounds.y() < 0) {
     cocoa_bounds.origin.y =
         (NSHeight(main_screen_rect) - NSHeight(cocoa_bounds)) / 2;
   }
 
   NSUInteger style_mask = NSTitledWindowMask | NSClosableWindowMask |
                           NSMiniaturizableWindowMask | NSResizableWindowMask |
                           NSTexturedBackgroundWindowMask;
   scoped_nsobject<NSWindow> window;
-  if (has_frame_) {
-    window.reset([[ShellNSWindow alloc]
+  if (frameless()) {
+    window.reset([[ShellFramelessNSWindow alloc]
         initWithContentRect:cocoa_bounds
                   styleMask:style_mask
                     backing:NSBackingStoreBuffered
                       defer:NO]);
   } else {
-    window.reset([[ShellFramelessNSWindow alloc]
+    window.reset([[ShellNSWindow alloc]
         initWithContentRect:cocoa_bounds
                   styleMask:style_mask
                     backing:NSBackingStoreBuffered
                       defer:NO]);
   }
   [window setTitle:base::SysUTF8ToNSString(extension()->name())];
   gfx::Size min_size = params.minimum_size;
   if (min_size.width() || min_size.height()) {
     [window setContentMinSize:NSMakeSize(min_size.width(), min_size.height())];
   }
   gfx::Size max_size = params.maximum_size;
   if (max_size.width() || max_size.height()) {
     CGFloat max_width = max_size.width() ? max_size.width() : CGFLOAT_MAX;
     CGFloat max_height = max_size.height() ? max_size.height() : CGFLOAT_MAX;
     [window setContentMaxSize:NSMakeSize(max_width, max_height)];
   }
 
   if (base::mac::IsOSSnowLeopard() &&
       [window respondsToSelector:@selector(setBottomCornerRounded:)])
     [window setBottomCornerRounded:NO];
 
   window_controller_.reset(
       [[ShellWindowController alloc] initWithWindow:window.release()]);
 
   NSView* view = web_contents()->GetView()->GetNativeView();
   [view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 
   // By default, the whole frameless window is not draggable.
-  if (!has_frame_) {
+  if (frameless()) {
     gfx::Rect window_bounds(
         0, 0, NSWidth(cocoa_bounds), NSHeight(cocoa_bounds));
     system_drag_exclude_areas_.push_back(window_bounds);
   }
 
   InstallView();
 
   [[window_controller_ window] setDelegate:window_controller_];
   [window_controller_ setShellWindow:this];
 
   extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryCocoa(
       shell_window_->profile(),
       window,
       extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
       shell_window));
 }
 
 void ShellWindowCocoa::InstallView() {
   NSView* view = web_contents()->GetView()->GetNativeView();
-  if (has_frame_) {
-    [view setFrame:[[window() contentView] bounds]];
-    [[window() contentView] addSubview:view];
-  } else {
+  if (frameless()) {
     // TODO(jeremya): find a cleaner way to send this information to the
     // WebContentsViewCocoa view.
     DCHECK([view
         respondsToSelector:@selector(setMouseDownCanMoveWindow:)]);
     [view setMouseDownCanMoveWindow:YES];
 
     NSView* frameView = [[window() contentView] superview];
     [view setFrame:[frameView bounds]];
     [frameView addSubview:view];
 
     [[window() standardWindowButton:NSWindowZoomButton] setHidden:YES];
     [[window() standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
     [[window() standardWindowButton:NSWindowCloseButton] setHidden:YES];
 
     InstallDraggableRegionViews();
+  } else {
+    [view setFrame:[[window() contentView] bounds]];
+    [[window() contentView] addSubview:view];
   }
 }
 
 void ShellWindowCocoa::UninstallView() {
   NSView* view = web_contents()->GetView()->GetNativeView();
   [view removeFromSuperview];
 }
 
 bool ShellWindowCocoa::IsActive() const {
   return [window() isKeyWindow];
@@ skipping 155 matching lines @@
 }
 
 void ShellWindowCocoa::UpdateWindowTitle() {
   string16 title = shell_window_->GetTitle();
   [window() setTitle:base::SysUTF16ToNSString(title)];
 }
 
 void ShellWindowCocoa::UpdateDraggableRegions(
     const std::vector<extensions::DraggableRegion>& regions) {
   // Draggable region is not supported for non-frameless window.
-  if (has_frame_)
+  if (!frameless())
     return;
 
   // To use system drag, the window has to be marked as draggable with
   // non-draggable areas being excluded via overlapping views.
   // 1) If no draggable area is provided, the window is not draggable at all.
   // 2) If only one draggable area is given, as this is the most common
   //    case, use the system drag. The non-draggable areas that are opposite of
   //    the draggable area are computed.
   // 3) Otherwise, use the custom drag. As such, we lose the capability to
   //    support some features like snapping into other space.
@@ skipping 98 matching lines @@
   // We still need one ControlRegionView to cover the whole window such that
   // mouse events could be captured.
   NSView* web_view = web_contents()->GetView()->GetNativeView();
   gfx::Rect window_bounds(
       0, 0, NSWidth([web_view bounds]), NSHeight([web_view bounds]));
   system_drag_exclude_areas_.clear();
   system_drag_exclude_areas_.push_back(window_bounds);
 
   // 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();
+  NativeShellWindow::UpdateDraggableRegions(regions);
 }
 
 void ShellWindowCocoa::HandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   if (event.skip_in_browser ||
       event.type == content::NativeWebKeyboardEvent::Char) {
     return;
   }
   [window() redispatchKeyEvent:event.os_event];
 }
 
 void ShellWindowCocoa::InstallDraggableRegionViews() {
-  DCHECK(!has_frame_);
+  DCHECK(frameless());
 
   // All ControlRegionViews should be added as children of the WebContentsView,
   // because WebContentsView will be removed and re-added when entering and
   // leaving fullscreen mode.
   NSView* webView = web_contents()->GetView()->GetNativeView();
   NSInteger webViewHeight = NSHeight([webView bounds]);
 
   // Remove all ControlRegionViews that are added last time.
   // Note that [webView subviews] returns the view's mutable internal array and
   // it should be copied to avoid mutating the original array while enumerating
@@ skipping 94 matching lines @@
   NSWindow* window = [window_controller_ window];
   CHECK(!window || [window isKindOfClass:[ShellNSWindow class]]);
   return static_cast<ShellNSWindow*>(window);
 }
 
 // static
 NativeShellWindow* NativeShellWindow::Create(
     ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
   return new ShellWindowCocoa(shell_window, params);
 }