Show avatar icon on V2 app's frame

ash/frame/header_painter_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/frame/header_painter_util.h"
 
 #include <algorithm>
 
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Radius of the header's top corners when the window is restored.
 const int kTopCornerRadiusWhenRestored = 2;
 
 // Distance between left edge of the window and the header icon.
 const int kIconXOffset = 9;
 
-// Height and width of header icon.
-const int kIconSize = 16;
+// Default height and width of header icon.
+const int kDefaultIconSize = 16;
 
 // Space between the title text and the caption buttons.
 const int kTitleCaptionButtonSpacing = 5;
 
 // Space between window icon and title text.
 const int kTitleIconOffsetX = 5;
 
 // Space between window edge and title text, when there is no icon.
 const int kTitleNoIconOffsetX = 8;
 
@@ skipping 13 matching lines @@
 int HeaderPainterUtil::GetTopCornerRadiusWhenRestored() {
   return kTopCornerRadiusWhenRestored;
 }
 
 // static
 int HeaderPainterUtil::GetIconXOffset() {
   return kIconXOffset;
 }
 
 // static
-int HeaderPainterUtil::GetIconSize() {
-  return kIconSize;
+int HeaderPainterUtil::GetDefaultIconSize() {
+  return kDefaultIconSize;
 }
 
 // static
 int HeaderPainterUtil::GetThemeBackgroundXInset() {
   return kThemeFrameImageInsetX;
 }
 
 // static
 gfx::Rect HeaderPainterUtil::GetTitleBounds(
     const views::View* icon,
@@ skipping 25 matching lines @@
 
   ui::LayerAnimator* parent_layer_animator =
       window->parent()->layer()->GetAnimator();
   return !parent_layer_animator->IsAnimatingProperty(
              ui::LayerAnimationElement::OPACITY) &&
          !parent_layer_animator->IsAnimatingProperty(
              ui::LayerAnimationElement::VISIBILITY);
 }
 
 }  // namespace ash