| OLD | NEW |
|---|
| 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 "ui/gfx/rect.h" | 9 #include "ui/gfx/rect.h" |
| 10 #include "ui/gfx/scoped_sk_region.h" | 10 #include "ui/gfx/scoped_sk_region.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 66 |
| 67 protected: | 67 protected: |
| 68 // views::View implementation. | 68 // views::View implementation. |
| 69 virtual void Layout() OVERRIDE; | 69 virtual void Layout() OVERRIDE; |
| 70 virtual void ViewHierarchyChanged( | 70 virtual void ViewHierarchyChanged( |
| 71 bool is_add, views::View *parent, views::View *child) OVERRIDE; | 71 bool is_add, views::View *parent, views::View *child) OVERRIDE; |
| 72 virtual gfx::Size GetMinimumSize() OVERRIDE; | 72 virtual gfx::Size GetMinimumSize() OVERRIDE; |
| 73 virtual gfx::Size GetMaximumSize() OVERRIDE; | 73 virtual gfx::Size GetMaximumSize() OVERRIDE; |
| 74 virtual void OnFocus() OVERRIDE; | 74 virtual void OnFocus() OVERRIDE; |
| 75 | 75 |
| 76 // ShellWindow implementation. | |
| 77 virtual void UpdateWindowTitle() OVERRIDE; | |
| 78 virtual void SetFullscreen(bool fullscreen) OVERRIDE; | |
| 79 virtual bool IsFullscreenOrPending() const OVERRIDE; | |
| 80 | |
| 81 private: | 76 private: |
| 82 friend class ShellWindowFrameView; | 77 friend class ShellWindowFrameView; |
| 83 | 78 |
| 84 virtual ~ShellWindowViews(); | 79 virtual ~ShellWindowViews(); |
| 85 | 80 |
| 86 // content::WebContentsDelegate implementation. | 81 // ShellWindow implementation. |
| 82 virtual void UpdateWindowTitle() OVERRIDE; |
| 83 virtual void SetFullscreen(bool fullscreen) OVERRIDE; |
| 84 virtual bool IsFullscreenOrPending() const OVERRIDE; |
| 87 virtual void UpdateDraggableRegions( | 85 virtual void UpdateDraggableRegions( |
| 88 const std::vector<extensions::DraggableRegion>& regions) OVERRIDE; | 86 const std::vector<extensions::DraggableRegion>& regions) OVERRIDE; |
| 89 | 87 |
| 90 void OnViewWasResized(); | 88 void OnViewWasResized(); |
| 91 | 89 |
| 92 views::WebView* web_view_; | 90 views::WebView* web_view_; |
| 93 views::Widget* window_; | 91 views::Widget* window_; |
| 94 bool is_fullscreen_; | 92 bool is_fullscreen_; |
| 95 | 93 |
| 96 gfx::ScopedSkRegion draggable_region_; | 94 gfx::ScopedSkRegion draggable_region_; |
| 97 | 95 |
| 98 bool frameless_; | 96 bool frameless_; |
| 99 gfx::Size minimum_size_; | 97 gfx::Size minimum_size_; |
| 100 gfx::Size maximum_size_; | 98 gfx::Size maximum_size_; |
| 101 | 99 |
| 102 DISALLOW_COPY_AND_ASSIGN(ShellWindowViews); | 100 DISALLOW_COPY_AND_ASSIGN(ShellWindowViews); |
| 103 }; | 101 }; |
| 104 | 102 |
| 105 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ | 103 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10831230:
Small ShellWindowViews cleanup. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src