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

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

Issue 10825111: 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_mac.mm ('k') | ui/test/test_suite.cc » ('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_win.h" 5 #include "ui/base/resource/resource_bundle_win.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "ui/base/layout.h" 10 #include "ui/base/layout.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 bool use_hidpi = false; 42 bool use_hidpi = false;
43 #if defined(ENABLE_HIDPI) 43 #if defined(ENABLE_HIDPI)
44 // If we're running in HiDPI mode at a scale larger than 150%, we switch 44 // If we're running in HiDPI mode at a scale larger than 150%, we switch
45 // to 2x resources for desktop layouts. 45 // to 2x resources for desktop layouts.
46 use_hidpi = ui::GetDPIScale() > 1.5; 46 use_hidpi = ui::GetDPIScale() > 1.5;
47 #endif 47 #endif
48 48
49 switch (ui::GetDisplayLayout()) { 49 switch (ui::GetDisplayLayout()) {
50 case ui::LAYOUT_TOUCH: 50 case ui::LAYOUT_TOUCH:
51 AddDataPackFromPath( 51 AddDataPackFromPath(
52 GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"), 52 GetResourcesPakFilePath("chrome_touch_100_percent.pak"),
53 SCALE_FACTOR_100P);
54 AddDataPackFromPath(
55 GetResourcesPakFilePath("ui_resources_100_percent.pak"),
56 SCALE_FACTOR_100P); 53 SCALE_FACTOR_100P);
57 break; 54 break;
58 default: 55 default:
59 if (use_hidpi) { 56 if (use_hidpi) {
60 AddDataPackFromPath(GetResourcesPakFilePath( 57 AddDataPackFromPath(GetResourcesPakFilePath(
61 "theme_resources_200_percent.pak"), 58 "chrome_200_percent.pak"),
62 SCALE_FACTOR_200P);
63 AddDataPackFromPath(GetResourcesPakFilePath(
64 "ui_resources_200_percent.pak"),
65 SCALE_FACTOR_200P); 59 SCALE_FACTOR_200P);
66 AddDataPackFromPath(GetResourcesPakFilePath( 60 AddDataPackFromPath(GetResourcesPakFilePath(
67 "webkit_resources_200_percent.pak"), 61 "webkit_resources_200_percent.pak"),
68 SCALE_FACTOR_200P); 62 SCALE_FACTOR_200P);
69 } else { 63 } else {
70 AddDataPackFromPath( 64 AddDataPackFromPath(
71 GetResourcesPakFilePath("theme_resources_100_percent.pak"), 65 GetResourcesPakFilePath("chrome_100_percent.pak"),
72 SCALE_FACTOR_100P);
73 AddDataPackFromPath(
74 GetResourcesPakFilePath("ui_resources_100_percent.pak"),
75 SCALE_FACTOR_100P); 66 SCALE_FACTOR_100P);
76 } 67 }
77 break; 68 break;
78 } 69 }
79 } 70 }
80 71
81 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { 72 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
82 // Flipped image is not used on Windows. 73 // Flipped image is not used on Windows.
83 DCHECK_EQ(rtl, RTL_DISABLED); 74 DCHECK_EQ(rtl, RTL_DISABLED);
84 75
85 // Windows only uses SkBitmap for gfx::Image, so this is the same as 76 // Windows only uses SkBitmap for gfx::Image, so this is the same as
86 // GetImageNamed. 77 // GetImageNamed.
87 return GetImageNamed(resource_id); 78 return GetImageNamed(resource_id);
88 } 79 }
89 80
90 void SetResourcesDataDLL(HINSTANCE handle) { 81 void SetResourcesDataDLL(HINSTANCE handle) {
91 resources_data_dll = handle; 82 resources_data_dll = handle;
92 } 83 }
93 84
94 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) { 85 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) {
95 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id)); 86 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id));
96 } 87 }
97 88
98 } // namespace ui; 89 } // namespace ui;
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_mac.mm ('k') | ui/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698