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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_EXTENSIONS_SHELL_WINDOW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_EXTENSIONS_SHELL_WINDOW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include "base/timer.h"
 #include "chrome/browser/ui/extensions/native_shell_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/x/active_window_watcher_x_observer.h"
 #include "ui/gfx/rect.h"
 
 class ExtensionKeybindingRegistryGtk;
 class Profile;
 
 namespace extensions {
 class Extension;
-struct DraggableRegion;
 }
 
 class ShellWindowGtk : public NativeShellWindow,
                        public ExtensionViewGtk::Container,
                        public ui::ActiveWindowWatcherXObserver {
  public:
   ShellWindowGtk(ShellWindow* shell_window,
                  const ShellWindow::CreateParams& params);
 
   // BaseWindow implementation.
@@ skipping 20 matching lines @@
   virtual void ActiveWindowChanged(GdkWindow* active_window) OVERRIDE;
 
  private:
   // NativeShellWindow implementation.
   virtual void SetFullscreen(bool fullscreen) OVERRIDE;
   virtual bool IsFullscreenOrPending() const OVERRIDE;
   virtual void UpdateWindowIcon() OVERRIDE;
   virtual void UpdateWindowTitle() OVERRIDE;
   virtual void HandleKeyboardEvent(
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
+  virtual void UpdateDraggableRegions(
+      const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
 
   content::WebContents* web_contents() const {
     return shell_window_->web_contents();
   }
   const extensions::Extension* extension() const {
     return shell_window_->extension();
   }
-  virtual void UpdateDraggableRegions(
-      const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
-  virtual void UpdateLegacyDraggableRegions(
-      const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
 
   virtual ~ShellWindowGtk();
 
   CHROMEGTK_CALLBACK_1(ShellWindowGtk, gboolean, OnMainWindowDeleteEvent,
                        GdkEvent*);
   CHROMEGTK_CALLBACK_1(ShellWindowGtk, gboolean, OnConfigure,
                        GdkEventConfigure*);
   CHROMEGTK_CALLBACK_1(ShellWindowGtk, gboolean, OnWindowState,
                        GdkEventWindowState*);
   CHROMEGTK_CALLBACK_1(ShellWindowGtk, gboolean, OnButtonPress,
@@ skipping 16 matching lines @@
 
   // The position and size of the non-maximized, non-fullscreen window.
   gfx::Rect restored_bounds_;
 
   // True if the RVH is in fullscreen mode. The window may not actually be in
   // fullscreen, however: some WMs don't support fullscreen.
   bool content_thinks_its_fullscreen_;
 
   // The region is treated as title bar, can be dragged to move
   // and double clicked to maximize.
-  SkRegion draggable_region_;
+  scoped_ptr<SkRegion> draggable_region_;
 
   // If true, don't call gdk_window_raise() when we get a click in the title
   // bar or window border.  This is to work around a compiz bug.
   bool suppress_window_raise_;
 
   // True if the window shows without frame.
   bool frameless_;
 
   // The timer used to save the window position for session restore.
   base::OneShotTimer<ShellWindowGtk> window_configure_debounce_timer_;
 
   // The Extension Keybinding Registry responsible for registering listeners for
   // accelerators that are sent to the window, that are destined to be turned
   // into events and sent to the extension.
   scoped_ptr<ExtensionKeybindingRegistryGtk> extension_keybinding_registry_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_EXTENSIONS_SHELL_WINDOW_GTK_H_