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

Unified Diff: components/exo/shell_surface.h

Issue 2837903002: Do not hide shadow underlay for max/fullscreen state even if the client disables the shadow. (Closed)
Patch Set: addressed comments Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/exo/shell_surface.cc » ('j') | components/exo/shell_surface.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/shell_surface.h
diff --git a/components/exo/shell_surface.h b/components/exo/shell_surface.h
index c8087ad78d9d15ea89215ebdd08980cdece9cfa4..beab4ac060b7063a0f5f41d7e9fecc623d2320f2 100644
--- a/components/exo/shell_surface.h
+++ b/components/exo/shell_surface.h
@@ -276,8 +276,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_; }
@@ -335,6 +335,8 @@ class ShellSurface : public SurfaceDelegate,
// In the coordinate system of the parent root window.
gfx::Point GetMouseLocation() const;
+ void ResetShadowWindows();
reveman 2017/04/26 18:00:56 nit: remove this after removing the reset call fro
oshima 2017/04/26 21:45:01 Done.
+
views::Widget* widget_ = nullptr;
Surface* surface_;
aura::Window* parent_;
@@ -365,8 +367,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;
@@ -377,6 +379,7 @@ class ShellSurface : public SurfaceDelegate,
int pending_top_inset_height_ = 0;
bool shadow_underlay_in_surface_ = true;
bool system_modal_ = false;
+ bool reset_shadow_windows_ = false;
reveman 2017/04/26 18:00:56 nit: "bool pending_shadow_underlay_in_surface_ = t
oshima 2017/04/26 21:45:01 Done.
DISALLOW_COPY_AND_ASSIGN(ShellSurface);
};
« no previous file with comments | « no previous file | components/exo/shell_surface.cc » ('j') | components/exo/shell_surface.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698