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

Side by Side Diff: chrome/browser/ui/views/extensions/shell_window_views.h

Issue 10827218: Replace gfx::ScopedSkRegion with scoped_ptr<SkRegion>. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/shell_window_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
7 7
8 #include "chrome/browser/ui/extensions/shell_window.h" 8 #include "chrome/browser/ui/extensions/shell_window.h"
9 #include "third_party/skia/include/core/SkRegion.h"
9 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
10 #include "ui/gfx/scoped_sk_region.h"
11 #include "ui/views/widget/widget_delegate.h" 11 #include "ui/views/widget/widget_delegate.h"
12 12
13 class Profile; 13 class Profile;
14 14
15 namespace extensions { 15 namespace extensions {
16 class Extension; 16 class Extension;
17 struct DraggableRegion; 17 struct DraggableRegion;
18 } 18 }
19 19
20 namespace views { 20 namespace views {
21 class WebView; 21 class WebView;
22 } 22 }
23 23
24 class ShellWindowViews : public ShellWindow, 24 class ShellWindowViews : public ShellWindow,
25 public views::WidgetDelegateView { 25 public views::WidgetDelegateView {
26 public: 26 public:
27 ShellWindowViews(Profile* profile, 27 ShellWindowViews(Profile* profile,
28 const extensions::Extension* extension, 28 const extensions::Extension* extension,
29 const GURL& url, 29 const GURL& url,
30 const CreateParams& params); 30 const CreateParams& params);
31 31
32 bool frameless() const { return frameless_; } 32 bool frameless() const { return frameless_; }
33 SkRegion* draggable_region() { return draggable_region_.Get(); } 33 SkRegion* draggable_region() { return draggable_region_.get(); }
34 34
35 // BaseWindow implementation. 35 // BaseWindow implementation.
36 virtual bool IsActive() const OVERRIDE; 36 virtual bool IsActive() const OVERRIDE;
37 virtual bool IsMaximized() const OVERRIDE; 37 virtual bool IsMaximized() const OVERRIDE;
38 virtual bool IsMinimized() const OVERRIDE; 38 virtual bool IsMinimized() const OVERRIDE;
39 virtual bool IsFullscreen() const OVERRIDE; 39 virtual bool IsFullscreen() const OVERRIDE;
40 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; 40 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
41 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 41 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
42 virtual gfx::Rect GetBounds() const OVERRIDE; 42 virtual gfx::Rect GetBounds() const OVERRIDE;
43 virtual void Show() OVERRIDE; 43 virtual void Show() OVERRIDE;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // content::WebContentsDelegate implementation. 86 // content::WebContentsDelegate implementation.
87 virtual void UpdateDraggableRegions( 87 virtual void UpdateDraggableRegions(
88 const std::vector<extensions::DraggableRegion>& regions) OVERRIDE; 88 const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
89 89
90 void OnViewWasResized(); 90 void OnViewWasResized();
91 91
92 views::WebView* web_view_; 92 views::WebView* web_view_;
93 views::Widget* window_; 93 views::Widget* window_;
94 bool is_fullscreen_; 94 bool is_fullscreen_;
95 95
96 gfx::ScopedSkRegion draggable_region_; 96 scoped_ptr<SkRegion> draggable_region_;
97 97
98 bool frameless_; 98 bool frameless_;
99 gfx::Size minimum_size_; 99 gfx::Size minimum_size_;
100 gfx::Size maximum_size_; 100 gfx::Size maximum_size_;
101 101
102 DISALLOW_COPY_AND_ASSIGN(ShellWindowViews); 102 DISALLOW_COPY_AND_ASSIGN(ShellWindowViews);
103 }; 103 };
104 104
105 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ 105 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/shell_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698