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

Unified Diff: ash/frame/custom_frame_view_ash.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: Real assets, crushed, review feedback 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/frame/custom_frame_view_ash.cc
diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc
index eb20914cc84e356b09b1bd3f4cdb0ad53d2ba1c9..39d756651f4e788bedcdc02397d25c93c17feb90 100644
--- a/ash/frame/custom_frame_view_ash.cc
+++ b/ash/frame/custom_frame_view_ash.cc
@@ -211,7 +211,7 @@ CustomFrameViewAsh::HeaderView::HeaderView(views::Widget* frame)
caption_button_container_->UpdateSizeButtonVisibility();
AddChildView(caption_button_container_);
- header_painter_->Init(frame_, this, NULL, caption_button_container_);
+ header_painter_->Init(frame_, this, caption_button_container_);
UpdateAvatarIcon();
Shell::GetInstance()->AddShellObserver(this);
@@ -250,7 +250,6 @@ void CustomFrameViewAsh::HeaderView::UpdateAvatarIcon() {
Shell::GetInstance()->session_state_delegate();
aura::Window* window = frame_->GetNativeView();
bool show = delegate->ShouldShowAvatar(window);
- int icon_size = 0;
if (!show) {
if (!avatar_icon_)
return;
@@ -266,9 +265,8 @@ void CustomFrameViewAsh::HeaderView::UpdateAvatarIcon() {
AddChildView(avatar_icon_);
}
avatar_icon_->SetImage(image);
- icon_size = image.width();
}
- header_painter_->UpdateWindowIcon(avatar_icon_, icon_size);
+ header_painter_->UpdateLeftHeaderView(avatar_icon_);
Layout();
}

Powered by Google App Engine
This is Rietveld 408576698