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

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

Issue 419093002: ui: Remove ResourceBundle::LoadCommonResources(). Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: InitParams Created 6 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
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 <limits> 7 #include <limits>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/big_endian.h" 10 #include "base/big_endian.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 157
158 private: 158 private:
159 ResourceBundle* rb_; 159 ResourceBundle* rb_;
160 const int resource_id_; 160 const int resource_id_;
161 161
162 DISALLOW_COPY_AND_ASSIGN(ResourceBundleImageSource); 162 DISALLOW_COPY_AND_ASSIGN(ResourceBundleImageSource);
163 }; 163 };
164 164
165 // static 165 // static
166 std::string ResourceBundle::InitSharedInstanceWithLocale( 166 std::string ResourceBundle::InitSharedInstanceWithLocale(
167 const std::string& pref_locale, Delegate* delegate) { 167 const std::string& pref_locale,
168 Delegate* delegate) {
168 InitSharedInstance(delegate); 169 InitSharedInstance(delegate);
169 g_shared_instance_->LoadCommonResources();
170 std::string result = g_shared_instance_->LoadLocaleResources(pref_locale); 170 std::string result = g_shared_instance_->LoadLocaleResources(pref_locale);
171 InitDefaultFontList(); 171 InitDefaultFontList();
172 return result; 172 return result;
173 } 173 }
174 174
175 // static 175 // static
176 std::string ResourceBundle::InitSharedInstanceLocaleOnly( 176 std::string ResourceBundle::InitSharedInstanceLocaleOnly(
177 const std::string& pref_locale, Delegate* delegate) { 177 const std::string& pref_locale,
178 Delegate* delegate) {
178 InitSharedInstance(delegate); 179 InitSharedInstance(delegate);
179 std::string result = g_shared_instance_->LoadLocaleResources(pref_locale); 180 std::string result = g_shared_instance_->LoadLocaleResources(pref_locale);
180 InitDefaultFontList(); 181 InitDefaultFontList();
181 return result; 182 return result;
182 } 183 }
183 184
184 // static 185 // static
185 void ResourceBundle::InitSharedInstanceWithPakFileRegion( 186 void ResourceBundle::InitSharedInstanceWithPakFileRegion(
186 base::File pak_file, 187 base::File pak_file,
187 const base::MemoryMappedFile::Region& region, 188 const base::MemoryMappedFile::Region& region,
188 bool should_load_common_resources) { 189 bool should_load_common_resources) {
189 InitSharedInstance(NULL); 190 InitSharedInstance(NULL);
190 if (should_load_common_resources) 191 if (should_load_common_resources)
191 g_shared_instance_->LoadCommonResources(); 192 g_shared_instance_->LoadCommonResources();
192 193
193 scoped_ptr<DataPack> data_pack( 194 scoped_ptr<DataPack> data_pack(new DataPack(SCALE_FACTOR_100P));
194 new DataPack(SCALE_FACTOR_100P));
195 if (!data_pack->LoadFromFileRegion(pak_file.Pass(), region)) { 195 if (!data_pack->LoadFromFileRegion(pak_file.Pass(), region)) {
196 NOTREACHED() << "failed to load pak file"; 196 NOTREACHED() << "failed to load pak file";
197 return; 197 return;
198 } 198 }
199 g_shared_instance_->locale_resources_data_.reset(data_pack.release()); 199 g_shared_instance_->locale_resources_data_.reset(data_pack.release());
200 InitDefaultFontList(); 200 InitDefaultFontList();
201 } 201 }
202 202
203 // static 203 // static
204 void ResourceBundle::InitSharedInstanceWithPakPath(const base::FilePath& path) { 204 void ResourceBundle::InitSharedInstanceWithPakPath(const base::FilePath& path) {
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 // static 862 // static
863 bool ResourceBundle::DecodePNG(const unsigned char* buf, 863 bool ResourceBundle::DecodePNG(const unsigned char* buf,
864 size_t size, 864 size_t size,
865 SkBitmap* bitmap, 865 SkBitmap* bitmap,
866 bool* fell_back_to_1x) { 866 bool* fell_back_to_1x) {
867 *fell_back_to_1x = PNGContainsFallbackMarker(buf, size); 867 *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
868 return gfx::PNGCodec::Decode(buf, size, bitmap); 868 return gfx::PNGCodec::Decode(buf, size, bitmap);
869 } 869 }
870 870
871 } // namespace ui 871 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698