Merge 34921 - Don't show download arrow animation for extensions....

chrome/browser/browser.cc

 // Copyright (c) 2006-2009 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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/gfx/point.h"
@@ skipping 2137 matching lines @@
 }
 
 void Browser::OnStartDownload(DownloadItem* download) {
   if (!window())
     return;
 
   // GetDownloadShelf creates the download shelf if it was not yet created.
   window()->GetDownloadShelf()->AddDownload(new DownloadItemModel(download));
 
   // Don't show the animation for "Save file" downloads.
-  if (download->total_bytes() > 0) {
-    TabContents* current_tab = GetSelectedTabContents();
-    // We make this check for the case of minimized windows, unit tests, etc.
-    if (platform_util::IsVisible(current_tab->GetNativeView()) &&
-        Animation::ShouldRenderRichAnimation())
-      DownloadStartedAnimation::Show(current_tab);
-  }
+  if (download->total_bytes() <= 0)
+    return;
+  
+  // For non-theme extensions, we don't show the download animation.
+  if (DownloadManager::IsExtensionInstall(download) &&
+      !ExtensionsService::IsDownloadFromMiniGallery(download->url()))
+    return;
+
+  TabContents* current_tab = GetSelectedTabContents();
+  // We make this check for the case of minimized windows, unit tests, etc.
+  if (platform_util::IsVisible(current_tab->GetNativeView()) &&
+      Animation::ShouldRenderRichAnimation())
+    DownloadStartedAnimation::Show(current_tab);
 }
 
 void Browser::ConfirmAddSearchProvider(const TemplateURL* template_url,
                                        Profile* profile) {
   window()->ConfirmAddSearchProvider(template_url, profile);
 }
 
 void Browser::ShowPageInfo(Profile* profile,
                            const GURL& url,
                            const NavigationEntry::SSLStatus& ssl,
@@ skipping 862 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }