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

Side by Side Diff: trunk/src/ui/base/resource/resource_bundle_auralinux.cc

Issue 22557005: Revert 216822 "Remove chrome.pak references, build resources int..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "ui/base/layout.h" 10 #include "ui/base/layout.h"
(...skipping 15 matching lines...) Expand all
26 } 26 }
27 27
28 } // namespace 28 } // namespace
29 29
30 namespace ui { 30 namespace ui {
31 31
32 void ResourceBundle::LoadCommonResources() { 32 void ResourceBundle::LoadCommonResources() {
33 // Always load the 1x data pack first as the 2x data pack contains both 1x and 33 // Always load the 1x data pack first as the 2x data pack contains both 1x and
34 // 2x images. The 1x data pack only has 1x images, thus passes in an accurate 34 // 2x images. The 1x data pack only has 1x images, thus passes in an accurate
35 // scale factor to gfx::ImageSkia::AddRepresentation. 35 // scale factor to gfx::ImageSkia::AddRepresentation.
36
37 AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
38 SCALE_FACTOR_NONE);
36 AddDataPackFromPath(GetResourcesPakFilePath( 39 AddDataPackFromPath(GetResourcesPakFilePath(
37 "chrome_100_percent.pak"), SCALE_FACTOR_100P); 40 "chrome_100_percent.pak"), SCALE_FACTOR_100P);
38 41
39 if (ui::IsScaleFactorSupported(SCALE_FACTOR_200P)) { 42 if (ui::IsScaleFactorSupported(SCALE_FACTOR_200P)) {
40 AddOptionalDataPackFromPath(GetResourcesPakFilePath( 43 AddOptionalDataPackFromPath(GetResourcesPakFilePath(
41 "chrome_200_percent.pak"), SCALE_FACTOR_200P); 44 "chrome_200_percent.pak"), SCALE_FACTOR_200P);
42 } 45 }
43 } 46 }
44 47
45 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { 48 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
46 // Flipped image is not used on ChromeOS. 49 // Flipped image is not used on ChromeOS.
47 DCHECK_EQ(rtl, RTL_DISABLED); 50 DCHECK_EQ(rtl, RTL_DISABLED);
48 return GetImageNamed(resource_id); 51 return GetImageNamed(resource_id);
49 } 52 }
50 53
51 } // namespace ui 54 } // namespace ui
OLDNEW
« no previous file with comments | « trunk/src/ui/base/resource/resource_bundle_android.cc ('k') | trunk/src/ui/base/resource/resource_bundle_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698