Framelet Prototype 2016

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 570 matching lines @@
 
 bool ThemeService::HasCustomImage(int id) const {
   return BrowserThemePack::IsPersistentImageID(id) && theme_supplier_ &&
          theme_supplier_->HasCustomImage(id);
 }
 
 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)
-    id = IDR_PRODUCT_LOGO_WHITE;
+  // TODO(fsamuel): Figure out why removing these resources on Android fixes
+  // loading.
+  // int ntp_alternate =
+  // GetDisplayProperty(ThemeProperties::NTP_LOGO_ALTERNATE);
+  // if (id == IDR_PRODUCT_LOGO && ntp_alternate != 0)
+  //  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;
 }
 
@@ skipping 170 matching lines @@
 
 bool ThemeService::BrowserThemeProvider::HasCustomImage(int id) const {
   return theme_service_.HasCustomImage(id);
 }
 
 base::RefCountedMemory* ThemeService::BrowserThemeProvider::GetRawData(
     int id,
     ui::ScaleFactor scale_factor) const {
   return theme_service_.GetRawData(id, scale_factor);
 }