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

Unified Diff: chrome/browser/ui/gtk/extensions/shell_window_gtk.h

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
« no previous file with comments | « chrome/browser/ui/extensions/shell_window.cc ('k') | chrome/browser/ui/gtk/extensions/shell_window_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/extensions/shell_window_gtk.h
diff --git a/chrome/browser/ui/gtk/extensions/shell_window_gtk.h b/chrome/browser/ui/gtk/extensions/shell_window_gtk.h
index 8c5cf102d8aeaddf70be1922fdde8b5765c70c1e..92b2c90be27cbdc2082e0710e4e3c2f0bf9add99 100644
--- a/chrome/browser/ui/gtk/extensions/shell_window_gtk.h
+++ b/chrome/browser/ui/gtk/extensions/shell_window_gtk.h
@@ -21,7 +21,6 @@ class Profile;
namespace extensions {
class Extension;
-struct DraggableRegion;
}
class ShellWindowGtk : public NativeShellWindow,
@@ -62,6 +61,8 @@ class ShellWindowGtk : public NativeShellWindow,
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();
@@ -69,10 +70,6 @@ class ShellWindowGtk : public NativeShellWindow,
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();
@@ -109,7 +106,7 @@ class ShellWindowGtk : public NativeShellWindow,
// 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.
« no previous file with comments | « chrome/browser/ui/extensions/shell_window.cc ('k') | chrome/browser/ui/gtk/extensions/shell_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698