Chromium Code Reviews| Index: chrome/browser/ui/views/extensions/shell_window_views.h |
| diff --git a/chrome/browser/ui/views/extensions/shell_window_views.h b/chrome/browser/ui/views/extensions/shell_window_views.h |
| index daea5613fa34f4b086bdf444c7c8e22fbf572a44..b539932310ceb8b812ebf24875ecc4c337889700 100644 |
| --- a/chrome/browser/ui/views/extensions/shell_window_views.h |
| +++ b/chrome/browser/ui/views/extensions/shell_window_views.h |
| @@ -45,7 +45,6 @@ class ShellWindowViews : public ShellWindow, |
| virtual void Minimize() OVERRIDE; |
| virtual void Restore() OVERRIDE; |
| virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; |
| - virtual void SetDraggableRegion(SkRegion* region) OVERRIDE; |
| virtual void FlashFrame(bool flash) OVERRIDE; |
| virtual bool IsAlwaysOnTop() const OVERRIDE; |
| @@ -61,6 +60,9 @@ class ShellWindowViews : public ShellWindow, |
| virtual void DeleteDelegate() OVERRIDE; |
| virtual views::View* GetInitiallyFocusedView() OVERRIDE; |
| + bool frameless() const { return frameless_; } |
| + SkRegion* draggable_region() { return draggable_region_.Get(); } |
|
Ben Goodger (Google)
2012/08/07 18:03:52
move these above the interface impls above.
jianli
2012/08/07 20:38:06
Done.
|
| + |
| protected: |
| // views::View implementation. |
| virtual void Layout() OVERRIDE; |
| @@ -80,15 +82,19 @@ class ShellWindowViews : public ShellWindow, |
| virtual ~ShellWindowViews(); |
| + // content::WebContentsDelegate implementation. |
| + virtual void UpdateDraggableRegions( |
| + const std::vector<content::DraggableRegion>& regions) OVERRIDE; |
| + |
| void OnViewWasResized(); |
| views::WebView* web_view_; |
| views::Widget* window_; |
| bool is_fullscreen_; |
| - gfx::ScopedSkRegion caption_region_; |
| + gfx::ScopedSkRegion draggable_region_; |
| - bool use_custom_frame_; |
| + bool frameless_; |
| gfx::Size minimum_size_; |
| gfx::Size maximum_size_; |