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

Unified Diff: ash/common/frame/default_header_painter.h

Issue 2724693002: mash: improves browser frame decorations (Closed)
Patch Set: merge Created 3 years, 9 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 | « ash/common/frame/custom_frame_view_ash.cc ('k') | ash/common/frame/default_header_painter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/frame/default_header_painter.h
diff --git a/ash/common/frame/default_header_painter.h b/ash/common/frame/default_header_painter.h
index c49992943daa8f5a2c3deaf1bd91aa5e9ce8c8b7..69f39ff1ab1a89ce60f5e82a92a75f2c4273fb63 100644
--- a/ash/common/frame/default_header_painter.h
+++ b/ash/common/frame/default_header_painter.h
@@ -9,6 +9,7 @@
#include "ash/ash_export.h"
#include "ash/common/frame/header_painter.h"
+#include "ash/public/interfaces/window_style.mojom.h"
#include "base/compiler_specific.h" // override
#include "base/gtest_prod_util.h"
#include "base/macros.h"
@@ -31,7 +32,8 @@ class FrameCaptionButtonContainerView;
class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
public gfx::AnimationDelegate {
public:
- DefaultHeaderPainter();
+ explicit DefaultHeaderPainter(
+ mojom::WindowStyle window_style = mojom::WindowStyle::DEFAULT);
~DefaultHeaderPainter() override;
// DefaultHeaderPainter does not take ownership of any of the parameters.
@@ -95,6 +97,7 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
// Returns whether the frame uses custom frame coloring.
bool UsesCustomFrameColors() const;
+ const mojom::WindowStyle window_style_;
views::Widget* frame_;
views::View* view_;
views::View* left_header_view_; // May be NULL.
« no previous file with comments | « ash/common/frame/custom_frame_view_ash.cc ('k') | ash/common/frame/default_header_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698