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

Side by Side Diff: ui/base/resource/resource_bundle_gtk.cc

Issue 10825234: Revert 150411 - Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/resource/resource_bundle_aurax11.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/resource/resource_bundle.h" 5 #include "ui/base/resource/resource_bundle.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/ref_counted_memory.h" 9 #include "base/memory/ref_counted_memory.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // Return just the name of the pack file. 61 // Return just the name of the pack file.
62 return FilePath(pak_name.c_str()); 62 return FilePath(pak_name.c_str());
63 } 63 }
64 64
65 } // namespace 65 } // namespace
66 66
67 void ResourceBundle::LoadCommonResources() { 67 void ResourceBundle::LoadCommonResources() {
68 AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"), 68 AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
69 SCALE_FACTOR_100P); 69 SCALE_FACTOR_100P);
70 AddDataPackFromPath(GetResourcesPakFilePath( 70 AddDataPackFromPath(GetResourcesPakFilePath(
71 "chrome_100_percent.pak"), 71 "theme_resources_100_percent.pak"),
72 SCALE_FACTOR_100P);
73 AddDataPackFromPath(GetResourcesPakFilePath(
74 "ui_resources_100_percent.pak"),
72 SCALE_FACTOR_100P); 75 SCALE_FACTOR_100P);
73 } 76 }
74 77
75 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { 78 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
76 // Use the negative |resource_id| for the key for BIDI-aware images. 79 // Use the negative |resource_id| for the key for BIDI-aware images.
77 int key = rtl == RTL_ENABLED ? -resource_id : resource_id; 80 int key = rtl == RTL_ENABLED ? -resource_id : resource_id;
78 81
79 // Check to see if the image is already in the cache. 82 // Check to see if the image is already in the cache.
80 { 83 {
81 base::AutoLock lock_scope(*images_and_fonts_lock_); 84 base::AutoLock lock_scope(*images_and_fonts_lock_);
(...skipping 23 matching lines...) Expand all
105 108
106 // Another thread raced the load and has already cached the image. 109 // Another thread raced the load and has already cached the image.
107 if (images_.count(key)) 110 if (images_.count(key))
108 return images_[key]; 111 return images_[key];
109 112
110 images_[key] = image; 113 images_[key] = image;
111 return images_[key]; 114 return images_[key];
112 } 115 }
113 116
114 } // namespace ui 117 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_aurax11.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698