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

Unified Diff: ash/wm/panels/panel_frame_view.cc

Issue 441803004: Introduce new WebApp header style for hosted apps and fizzy apps on ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 4 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
Index: ash/wm/panels/panel_frame_view.cc
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
index 24e37b5fa239f6bb134dfd73e57028a18d6fe77f..a62fe163ddd698fed8e0d72970b0e149555b3a3e 100644
--- a/ash/wm/panels/panel_frame_view.cc
+++ b/ash/wm/panels/panel_frame_view.cc
@@ -43,12 +43,13 @@ void PanelFrameView::InitHeaderPainter() {
FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
AddChildView(caption_button_container_);
+ header_painter_->Init(frame_, this, caption_button_container_);
+
if (frame_->widget_delegate()->ShouldShowWindowIcon()) {
window_icon_ = new views::ImageView();
AddChildView(window_icon_);
+ header_painter_->UpdateLeftHeaderView(window_icon_);
}
-
- header_painter_->Init(frame_, this, window_icon_, caption_button_container_);
}
int PanelFrameView::NonClientTopBorderHeight() const {
« no previous file with comments | « ash/resources/default_200_percent/common/window_control_icon_back_inactive.png ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698