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

chrome/browser/ui/gtk/extensions/shell_window_gtk.cc

 // 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/gtk/extensions/shell_window_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/gtk_window_util.h"
 #include "chrome/browser/web_applications/web_app.h"
-#include "chrome/common/extensions/draggable_region.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/render_view_host.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 "ui/base/x/active_window_watcher_x.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
 // The timeout in milliseconds before we'll get the true window position with
 // gtk_window_get_position() after the last GTK configure-event signal.
 const int kDebounceTimeoutMilliseconds = 100;
 
 } // namespace
 
 ShellWindowGtk::ShellWindowGtk(ShellWindow* shell_window,
                                const ShellWindow::CreateParams& params)
-    : shell_window_(shell_window),
+    : NativeShellWindow(params),
+      shell_window_(shell_window),
+      window_(NULL),
       state_(GDK_WINDOW_STATE_WITHDRAWN),
       is_active_(!ui::ActiveWindowWatcherX::WMSupportsActivation()),
-      content_thinks_its_fullscreen_(false),
-      frameless_(params.frame == ShellWindow::CreateParams::FRAME_NONE) {
+      content_thinks_its_fullscreen_(false) {
   window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
 
   gfx::NativeView native_view =
       web_contents()->GetView()->GetNativeView();
   gtk_container_add(GTK_CONTAINER(window_), native_view);
 
   if (params.bounds.x() >= 0 && params.bounds.y() >= 0)
     gtk_window_move(window_, params.bounds.x(), params.bounds.y());
 
   // This is done to avoid a WM "feature" where setting the window size to
   // the monitor size causes the WM to set the EWMH for full screen mode.
-  if (frameless_ &&
+  if (frameless() &&
       gtk_window_util::BoundsMatchMonitorSize(window_, params.bounds)) {
     gtk_window_set_default_size(
         window_, params.bounds.width(), params.bounds.height() - 1);
   } else {
     gtk_window_set_default_size(
         window_, params.bounds.width(), params.bounds.height());
   }
 
   // make sure bounds_ and restored_bounds_ have correct values until we
   // get our first configure-event
   bounds_ = restored_bounds_ = params.bounds;
   gint x, y;
   gtk_window_get_position(window_, &x, &y);
   bounds_.set_origin(gfx::Point(x, y));
 
   // Hide titlebar when {frame: 'none'} specified on ShellWindow.
-  if (frameless_)
+  if (frameless())
     gtk_window_set_decorated(window_, false);
 
   int min_width = params.minimum_size.width();
   int min_height = params.minimum_size.height();
   int max_width = params.maximum_size.width();
   int max_height = params.maximum_size.height();
   GdkGeometry hints;
   int hints_mask = 0;
   if (min_width || min_height) {
     hints.min_height = min_height;
@@ skipping 24 matching lines @@
 
   gtk_window_util::SetWindowCustomClass(window_,
       web_app::GetWMClassFromAppName(extension()->name()));
 
   g_signal_connect(window_, "delete-event",
                    G_CALLBACK(OnMainWindowDeleteEventThunk), this);
   g_signal_connect(window_, "configure-event",
                    G_CALLBACK(OnConfigureThunk), this);
   g_signal_connect(window_, "window-state-event",
                    G_CALLBACK(OnWindowStateThunk), this);
-  if (frameless_) {
+  if (frameless()) {
     g_signal_connect(window_, "button-press-event",
                      G_CALLBACK(OnButtonPressThunk), this);
   }
 
   // Add the keybinding registry.
   extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryGtk(
       shell_window_->profile(),
       window_,
       extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
       shell_window_));
@@ skipping 158 matching lines @@
     content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
     if (rvh)
       rvh->ExitFullscreen();
   }
 
   return FALSE;
 }
 
 gboolean ShellWindowGtk::OnButtonPress(GtkWidget* widget,
                                        GdkEventButton* event) {
-  if (!draggable_region_.isEmpty() &&
-      draggable_region_.contains(event->x, event->y)) {
+  if (IsInsideDraggableRegions(event->x, event->y)) {
     if (event->button == 1) {
       if (GDK_BUTTON_PRESS == event->type) {
         if (!suppress_window_raise_)
           gdk_window_raise(GTK_WIDGET(widget)->window);
 
         return gtk_window_util::HandleTitleBarLeftMousePress(
             GTK_WINDOW(widget), bounds_, event);
       } else if (GDK_2BUTTON_PRESS == event->type) {
         bool is_maximized = gdk_window_get_state(GTK_WIDGET(widget)->window) &
                             GDK_WINDOW_STATE_MAXIMIZED;
@@ skipping 38 matching lines @@
 void ShellWindowGtk::UpdateWindowTitle() {
   string16 title = shell_window_->GetTitle();
   gtk_window_set_title(window_, UTF16ToUTF8(title).c_str());
 }
 
 void ShellWindowGtk::HandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   // No-op.
 }
 
-void ShellWindowGtk::UpdateDraggableRegions(
-    const std::vector<extensions::DraggableRegion>& regions) {
-  // Draggable region is not supported for non-frameless window.
-  if (!frameless_)
-    return;
-
-  SkRegion draggable_region;
-
-  // By default, the whole window is non-draggable. We need to explicitly
-  // include those draggable regions.
-  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_ = draggable_region;
-}
-
-void ShellWindowGtk::UpdateLegacyDraggableRegions(
-    const std::vector<extensions::DraggableRegion>& regions) {
-  // Draggable region is not supported for non-frameless window.
-  if (!frameless_)
-    return;
-
-  SkRegion draggable_region;
-
-  // By default, the whole window is draggable.
-  gfx::Rect bounds = GetBounds();
-  draggable_region.op(0, 0, bounds.right(), bounds.bottom(),
-                      SkRegion::kUnion_Op);
-
-  // Exclude those designated as non-draggable.
-  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(),
-                        SkRegion::kDifference_Op);
-  }
-
-  draggable_region_ = draggable_region;
-}
-
 // static
 NativeShellWindow* NativeShellWindow::Create(
     ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
   return new ShellWindowGtk(shell_window, params);
 }