Support panel titles and Icons for v1 apps

ash/wm/frame_painter.cc

 // Copyright (c) 2012 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/wm/frame_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
@@ skipping 26 matching lines @@
 using aura::RootWindow;
 using aura::Window;
 
 namespace {
 // TODO(jamescook): Border is specified to be a single pixel overlapping
 // the web content and may need to be built into the shadow layers instead.
 const int kBorderThickness = 0;
 // Space between left edge of window and popup window icon.
 const int kIconOffsetX = 9;
 // Space between top of window and popup window icon.
-const int kIconOffsetY = 9;
+const int kIconOffsetY = 5;
 // Height and width of window icon.
 const int kIconSize = 16;
 // Space between the title text and the caption buttons.
 const int kTitleLogoSpacing = 5;
 // Space between window icon and title text.
 const int kTitleIconOffsetX = 4;
 // Space between window edge and title text, when there is no icon.
 const int kTitleNoIconOffsetX = 8;
 // Color for the title text.
 const SkColor kTitleTextColor = SkColorSetRGB(40, 40, 40);
@@ skipping 529 matching lines @@
   if (immersive_button_) {
     gfx::Size immersive_size = immersive_button_->GetPreferredSize();
     // TODO(jamescook): Fix layout when we have real art.
     immersive_button_->SetBounds(
         size_button_->x() - immersive_size.width() - kImmersiveButtonOffsetX,
         size_button_->y(),
         immersive_size.width(),
         immersive_size.height());
   }
 
-  if (window_icon_)
+  if (window_icon_) {
     window_icon_->SetBoundsRect(
         gfx::Rect(kIconOffsetX, kIconOffsetY, kIconSize, kIconSize));
+  }
 }
 
 void FramePainter::SchedulePaintForTitle(views::NonClientFrameView* view,
                                          const gfx::Font& title_font) {
   frame_->non_client_view()->SchedulePaintInRect(
       GetTitleBounds(view, title_font));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // aura::WindowObserver overrides:
@@ skipping 263 matching lines @@
   int title_y =
       (view->GetBoundsForClientView().y() - title_font.GetHeight()) / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, size_button_->x() - kTitleLogoSpacing - title_x),
       title_font.GetHeight());
 }
 
 }  // namespace ash