| 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 18beabf4d4b353d88d2d5c25beb27e91ef7a69f6..95f2715d733c75d5f5a65fdacec8bfa25ea3f78a 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;
|
| }
|
|
|
| @@ -30,7 +32,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);
|
| @@ -78,6 +81,10 @@ class ShellWindowViews : public NativeShellWindow,
|
| virtual bool ShouldShowWindowTitle() const OVERRIDE;
|
| virtual void OnWidgetMove() OVERRIDE;
|
|
|
| + // WebContentsObserver implementation.
|
| + virtual void RenderViewCreated(
|
| + content::RenderViewHost* render_view_host) OVERRIDE;
|
| +
|
| protected:
|
| // views::View implementation.
|
| virtual void Layout() OVERRIDE;
|
| @@ -125,7 +132,8 @@ class ShellWindowViews : public NativeShellWindow,
|
|
|
| scoped_ptr<SkRegion> draggable_region_;
|
|
|
| - bool frameless_;
|
| + const bool frameless_;
|
| + const bool transparent_background_;
|
| gfx::Size minimum_size_;
|
| gfx::Size maximum_size_;
|
|
|
|
|