Two changes to extension app icons:...

chrome/browser/views/tabs/tab_renderer.cc

 // Copyright (c) 2010 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 "chrome/browser/views/tabs/tab_renderer.h"
 
 #include <limits>
 
 #include "app/animation_container.h"
 #include "app/l10n_util.h"
@@ skipping 305 matching lines @@
   if (data_.phantom != phantom || !loading_only) {
     data_.title = contents->GetTitle();
     data_.off_the_record = contents->profile()->IsOffTheRecord();
     data_.crashed = contents->is_crashed();
     SkBitmap app_icon = contents->app_extension_icon();
     if (!app_icon.empty())
       data_.favicon = app_icon;
     else
       data_.favicon = contents->GetFavIcon();
     data_.phantom = phantom;
+    data_.app = contents->is_app();
 
     // Sets the accessible name for the tab.
     SetAccessibleName(UTF16ToWide(data_.title));
   }
 
   // TODO(glen): Temporary hax.
   theme_provider_ = contents->profile()->GetThemeProvider();
 
   // Loading state also involves whether we show the favicon, since that's where
   // we display the throbber.
@@ skipping 635 matching lines @@
 
   tab_alpha_nano.image_l = rb.GetBitmapNamed(IDR_TAB_ALPHA_NANO_LEFT);
   tab_alpha_nano.image_r = rb.GetBitmapNamed(IDR_TAB_ALPHA_NANO_RIGHT);
 
   tab_active.image_l = rb.GetBitmapNamed(IDR_TAB_ACTIVE_LEFT);
   tab_active.image_c = rb.GetBitmapNamed(IDR_TAB_ACTIVE_CENTER);
   tab_active.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);
   tab_active.l_width = tab_active.image_l->width();
   tab_active.r_width = tab_active.image_r->width();
 
-  // This is high much taller *visually* the regular tab is compared to the
-  // nano tabs. The images are the same height, this is really just the
-  // difference in whitespace above the tab image.
+  // The regular tab is high much taller *visually* than the nano tabs.
+  // The images are the same height, this is really just the difference
+  // in whitespace above the tab image (regular vs nano).
   const int kMiniTabDiffHeight = 14;
 
   tab_active_nano.image_l = rb.GetBitmapNamed(IDR_TAB_ACTIVE_NANO_LEFT);
   tab_active_nano.image_c = rb.GetBitmapNamed(IDR_TAB_ACTIVE_NANO_CENTER);
   tab_active_nano.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_NANO_RIGHT);
   tab_active_nano.l_width = tab_active_nano.image_l->width();
   tab_active_nano.r_width = tab_active_nano.image_r->width();
   tab_active_nano.y_offset = kMiniTabDiffHeight;
 
   tab_inactive.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
@@ skipping 11 matching lines @@
 
 void TabRenderer::SetBlocked(bool blocked) {
   if (data_.blocked == blocked)
     return;
   data_.blocked = blocked;
   if (blocked)
     StartPulse();
   else
     StopPulse();
 }