diff options
Diffstat (limited to 'chromium/components/exo/shell_surface.h')
| -rw-r--r-- | chromium/components/exo/shell_surface.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chromium/components/exo/shell_surface.h b/chromium/components/exo/shell_surface.h index d621a988607..0bf2b7e916f 100644 --- a/chromium/components/exo/shell_surface.h +++ b/chromium/components/exo/shell_surface.h @@ -220,6 +220,11 @@ class ShellSurface : public SurfaceDelegate, bool CanMaximize() const override; bool CanMinimize() const override; base::string16 GetWindowTitle() const override; + void SaveWindowPlacement(const gfx::Rect& bounds, + ui::WindowShowState show_state) override; + bool GetSavedWindowPlacement(const views::Widget* widget, + gfx::Rect* bounds, + ui::WindowShowState* show_state) const override; void WindowClosing() override; views::Widget* GetWidget() override; const views::Widget* GetWidget() const override; @@ -260,8 +265,8 @@ class ShellSurface : public SurfaceDelegate, // Overridden from ui::AcceleratorTarget: bool AcceleratorPressed(const ui::Accelerator& accelerator) override; - aura::Window* shadow_overlay() { return shadow_overlay_; } - aura::Window* shadow_underlay() { return shadow_underlay_; } + aura::Window* shadow_overlay() { return shadow_overlay_.get(); } + aura::Window* shadow_underlay() { return shadow_underlay_.get(); } Surface* surface_for_testing() { return surface_; } @@ -342,8 +347,8 @@ class ShellSurface : public SurfaceDelegate, gfx::Vector2d pending_origin_offset_accumulator_; int resize_component_ = HTCAPTION; // HT constant (see ui/base/hit_test.h) int pending_resize_component_ = HTCAPTION; - aura::Window* shadow_overlay_ = nullptr; - aura::Window* shadow_underlay_ = nullptr; + std::unique_ptr<aura::Window> shadow_overlay_; + std::unique_ptr<aura::Window> shadow_underlay_; std::unique_ptr<ui::EventHandler> shadow_underlay_event_handler_; gfx::Rect shadow_content_bounds_; float shadow_background_opacity_ = 1.0; @@ -353,6 +358,7 @@ class ShellSurface : public SurfaceDelegate, int top_inset_height_ = 0; int pending_top_inset_height_ = 0; bool shadow_underlay_in_surface_ = true; + bool pending_shadow_underlay_in_surface_ = true; bool system_modal_ = false; DISALLOW_COPY_AND_ASSIGN(ShellSurface); |