Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: ui/base/resource/data_pack.cc

Issue 2209363002: Remove material design resource pak infrastructure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove another mac test file Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/resource/data_pack.h ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/data_pack.cc
diff --git a/ui/base/resource/data_pack.cc b/ui/base/resource/data_pack.cc
index 245c1b7c84206779e16c43cfb34c8135c5646971..4a98c1835ad5783b8e002a8f24b4f10219b04925 100644
--- a/ui/base/resource/data_pack.cc
+++ b/ui/base/resource/data_pack.cc
@@ -67,8 +67,7 @@ namespace ui {
DataPack::DataPack(ui::ScaleFactor scale_factor)
: resource_count_(0),
text_encoding_type_(BINARY),
- scale_factor_(scale_factor),
- has_only_material_design_assets_(false) {
+ scale_factor_(scale_factor) {
}
DataPack::~DataPack() {
@@ -233,10 +232,6 @@ ui::ScaleFactor DataPack::GetScaleFactor() const {
return scale_factor_;
}
-bool DataPack::HasOnlyMaterialDesignAssets() const {
- return has_only_material_design_assets_;
-}
-
#if DCHECK_IS_ON()
void DataPack::CheckForDuplicateResources(
const ScopedVector<ResourceHandle>& packs) {
@@ -246,10 +241,6 @@ void DataPack::CheckForDuplicateResources(
const uint16_t resource_id = entry->resource_id;
const float resource_scale = GetScaleForScaleFactor(scale_factor_);
for (const ResourceHandle* handle : packs) {
- if (HasOnlyMaterialDesignAssets() !=
- handle->HasOnlyMaterialDesignAssets()) {
- continue;
- }
if (GetScaleForScaleFactor(handle->GetScaleFactor()) != resource_scale)
continue;
DCHECK(!handle->HasResource(resource_id)) << "Duplicate resource "
« no previous file with comments | « ui/base/resource/data_pack.h ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698