[Resources] Use the new product logo in several places

chrome/browser/themes/theme_service.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 "chrome/browser/themes/theme_service.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 726 matching lines @@
     }
 
     default:
       return -1;
   }
 }
 
 base::RefCountedMemory* ThemeService::GetRawData(
     int id,
     ui::ScaleFactor scale_factor) const {
-  // Check to see whether we should substitute some images.
-  int ntp_alternate = GetDisplayProperty(ThemeProperties::NTP_LOGO_ALTERNATE);
-  if (id == IDR_PRODUCT_LOGO && ntp_alternate != 0)

[Evan Stade, 2017/03/08 17:56:30]

are you sure this code is dead? It seems to be hit when I open the app page with
a custom theme.

If this code is dead, we also don't need NTP_LOGO_ALTERNATE any more do we?

[Mathieu, 2017/03/08 18:20:22]

I am certain. I instrumented the codepaths in this file and theme_source.cc and
the image fetch goes through ThemeSource::SendThemeBitmap (which just gets it
from the resource bundle). 

NTP_LOGO_ALTERNATE as a property is still used by the current NTP [1].

[1]
https://cs.chromium.org/chromium/src/chrome/browser/search/instant_service.cc...

-    id = IDR_PRODUCT_LOGO_WHITE;
-
   base::RefCountedMemory* data = nullptr;
   if (theme_supplier_)
     data = theme_supplier_->GetRawData(id, scale_factor);
   if (!data)
     data = rb_.LoadDataResourceBytesForScale(id, ui::SCALE_FACTOR_100P);
 
   return data;
 }
 
 gfx::Image ThemeService::GetImageNamed(int id, bool incognito) const {
@@ skipping 107 matching lines @@
 
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
 bool ThemeService::IsSupervisedUser() const {
   return profile_->IsSupervised();
 }
 
 void ThemeService::SetSupervisedUserTheme() {
   SetCustomDefaultTheme(new SupervisedUserTheme);
 }
 #endif