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

Unified Diff: ash/wm/panel_frame_view.h

Issue 12212207: Support panel titles and Icons for v1 apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comment. Created 7 years, 10 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/wm/frame_painter.cc ('k') | ash/wm/panel_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panel_frame_view.h
diff --git a/ash/wm/panel_frame_view.h b/ash/wm/panel_frame_view.h
index 248eec5406c37d3d27f7f18cc3f29dd1f66943d2..e9e97bc8bddabeb499e08e0942a90df1dcb32c19 100644
--- a/ash/wm/panel_frame_view.h
+++ b/ash/wm/panel_frame_view.h
@@ -8,6 +8,7 @@
#include "ash/ash_export.h"
#include "base/basictypes.h"
#include "ui/aura/aura_export.h"
+#include "ui/gfx/font.h"
#include "ui/views/window/non_client_view.h"
#include "ui/views/controls/button/button.h" // ButtonListener
@@ -31,7 +32,7 @@ class ASH_EXPORT PanelFrameView : public views::NonClientFrameView,
virtual ~PanelFrameView();
private:
- void InitFramePainter(views::Widget* frame);
+ void InitFramePainter();
// Overridden from views::NonClientFrameView:
virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
@@ -55,9 +56,12 @@ class ASH_EXPORT PanelFrameView : public views::NonClientFrameView,
// Child View class describing the panel's title bar behavior
// and buttons, owned by the view hierarchy
scoped_ptr<FramePainter> frame_painter_;
+ views::Widget* frame_;
views::ImageButton* close_button_;
views::ImageButton* minimize_button_;
+ views::ImageButton* window_icon_;
gfx::Rect client_view_bounds_;
+ const gfx::Font title_font_;
DISALLOW_COPY_AND_ASSIGN(PanelFrameView);
};
« no previous file with comments | « ash/wm/frame_painter.cc ('k') | ash/wm/panel_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698