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 2821dad14188de96bc16a037c6f68a7097e640f7..0285373e03466f74d1e5403f7fc9a5261170d218 100644 |
| --- a/chrome/browser/ui/views/extensions/shell_window_views.h |
| +++ b/chrome/browser/ui/views/extensions/shell_window_views.h |
| @@ -9,6 +9,7 @@ |
| #include "chrome/browser/ui/extensions/native_shell_window.h" |
| #include "chrome/browser/ui/extensions/shell_window.h" |
| #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" |
| +#include "content/public/browser/web_contents_observer.h" |
| #include "third_party/skia/include/core/SkRegion.h" |
| #include "ui/gfx/image/image_skia.h" |
| #include "ui/gfx/rect.h" |
| @@ -18,6 +19,7 @@ class ExtensionKeybindingRegistryViews; |
| class Profile; |
| namespace content { |
| +class RenderViewHost; |
| class WebContents; |
| } |
| @@ -31,7 +33,8 @@ class WebView; |
| } |
| class ShellWindowViews : public NativeShellWindow, |
| - public views::WidgetDelegateView { |
| + public views::WidgetDelegateView, |
| + public content::WebContentsObserver { |
| public: |
| ShellWindowViews(ShellWindow* shell_window, |
| const ShellWindow::CreateParams& params); |
| @@ -77,6 +80,10 @@ class ShellWindowViews : public NativeShellWindow, |
| virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; |
| virtual bool ShouldShowWindowTitle() const OVERRIDE; |
| + // WebContentsObserver implementation. |
| + virtual void RenderViewCreated( |
| + content::RenderViewHost* render_view_host) OVERRIDE; |
| + |
| protected: |
| // views::View implementation. |
| virtual void Layout() OVERRIDE; |
| @@ -126,6 +133,7 @@ class ShellWindowViews : public NativeShellWindow, |
| scoped_ptr<SkRegion> draggable_region_; |
| bool frameless_; |
| + bool transparent_background_; |
|
sky
2012/09/28 22:29:13
const
Bernie
2012/10/10 21:05:01
Done (also for frameless_).
|
| gfx::Size minimum_size_; |
| gfx::Size maximum_size_; |