Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc |
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc |
index c4fc2e806c9b22fe09cd2b72a80922ac94bbb360..addf06e0d0d2c8ccda8d327778a0ecad6460b4fd 100644 |
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc |
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc |
@@ -401,7 +401,10 @@ bool BrowserNonClientFrameViewAsh::UsePackagedAppHeaderStyle() const { |
void BrowserNonClientFrameViewAsh::LayoutAvatar() { |
DCHECK(avatar_button()); |
+#if !defined(OS_CHROMEOS) |
+ // ChromeOS shows avatar on V1 app. |
pkotwicz
2014/03/18 04:41:15
Personally, I would land the changes for hosted ap
oshima
2014/03/18 14:57:03
sure removed from this CL.
|
DCHECK(browser_view()->IsTabStripVisible()); |
+#endif |
gfx::ImageSkia incognito_icon = browser_view()->GetOTRAvatarIcon(); |
int avatar_bottom = GetTopInset() + |