Remove some more desktop infobar PNGs.

chrome/browser/ui/startup/default_browser_infobar_delegate.cc

 // Copyright 2016 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/ui/startup/default_browser_infobar_delegate.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/grit/chromium_strings.h"
@@ skipping 79 matching lines @@
 #else
   return PAGE_ACTION_TYPE;
 #endif
 }
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 DefaultBrowserInfoBarDelegate::GetIdentifier() const {
   return DEFAULT_BROWSER_INFOBAR_DELEGATE;
 }
 
-int DefaultBrowserInfoBarDelegate::GetIconId() const {
-  return IDR_PRODUCT_LOGO_32;
-}
-
 gfx::VectorIconId DefaultBrowserInfoBarDelegate::GetVectorIconId() const {
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
-#else
   return gfx::VectorIconId::CHROME_PRODUCT;
-#endif
 }
 
 #if defined(OS_WIN)
 gfx::Image DefaultBrowserInfoBarDelegate::GetIcon() const {
   // Experiment for the chrome product icon used on the default browser
   // prompt.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    std::string icon_color = variations::GetVariationParamValue(
-        kDefaultBrowserPromptStyle, "IconColor");
-    if (icon_color == "Colored") {
-      return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-          IDR_PRODUCT_LOGO_16);
-    }
-    if ((icon_color == "Blue") && (GetInfoBarType() == WARNING_TYPE)) {
-      // WARNING_TYPE infobars use orange icons by default.
-      return gfx::Image(
-          gfx::CreateVectorIcon(GetVectorIconId(), 16, gfx::kGoogleBlue500));
-    }
+  std::string icon_color = variations::GetVariationParamValue(
+      kDefaultBrowserPromptStyle, "IconColor");
+  if (icon_color == "Colored") {
+    return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+        IDR_PRODUCT_LOGO_16);
+  }
+  if ((icon_color == "Blue") && (GetInfoBarType() == WARNING_TYPE)) {
+    // WARNING_TYPE infobars use orange icons by default.
+    return gfx::Image(
+        gfx::CreateVectorIcon(GetVectorIconId(), 16, gfx::kGoogleBlue500));
   }
   return ConfirmInfoBarDelegate::GetIcon();
 }
 #endif  // defined(OS_WIN)
 
 bool DefaultBrowserInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   return should_expire_ && ConfirmInfoBarDelegate::ShouldExpire(details);
 }
 
@@ skipping 62 matching lines @@
     const shell_integration::DefaultWebClientWorkerCallback& callback) {
   return new shell_integration::DefaultBrowserWorker(callback);
 }
 
 void DefaultBrowserInfoBarDelegate::OnSetAsDefaultFinished(
     shell_integration::DefaultWebClientState state) {
   infobar()->owner()->RemoveInfoBar(infobar());
 }
 
 }  // namespace chrome