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

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

Issue 10701105: Update webkit_resources to support high-dpi assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change resource_bundle_mac.mm to load webkit_resources* on Mac as for other platforms 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') | webkit/glue/resources/amex.png » ('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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 SCALE_FACTOR_100P); 56 SCALE_FACTOR_100P);
57 break; 57 break;
58 default: 58 default:
59 if (use_hidpi) { 59 if (use_hidpi) {
60 AddDataPackFromPath(GetResourcesPakFilePath( 60 AddDataPackFromPath(GetResourcesPakFilePath(
61 "theme_resources_200_percent.pak"), 61 "theme_resources_200_percent.pak"),
62 SCALE_FACTOR_200P); 62 SCALE_FACTOR_200P);
63 AddDataPackFromPath(GetResourcesPakFilePath( 63 AddDataPackFromPath(GetResourcesPakFilePath(
64 "ui_resources_200_percent.pak"), 64 "ui_resources_200_percent.pak"),
65 SCALE_FACTOR_200P); 65 SCALE_FACTOR_200P);
66 AddDataPackFromPath(GetResourcesPakFilePath(
67 "webkit_resources_200_percent.pak"),
68 SCALE_FACTOR_200P);
66 } else { 69 } else {
67 AddDataPackFromPath( 70 AddDataPackFromPath(
68 GetResourcesPakFilePath("theme_resources_100_percent.pak"), 71 GetResourcesPakFilePath("theme_resources_100_percent.pak"),
69 SCALE_FACTOR_100P); 72 SCALE_FACTOR_100P);
70 AddDataPackFromPath( 73 AddDataPackFromPath(
71 GetResourcesPakFilePath("ui_resources_100_percent.pak"), 74 GetResourcesPakFilePath("ui_resources_100_percent.pak"),
72 SCALE_FACTOR_100P); 75 SCALE_FACTOR_100P);
73 } 76 }
74 break; 77 break;
75 } 78 }
(...skipping 10 matching lines...) Expand all
86 89
87 void SetResourcesDataDLL(HINSTANCE handle) { 90 void SetResourcesDataDLL(HINSTANCE handle) {
88 resources_data_dll = handle; 91 resources_data_dll = handle;
89 } 92 }
90 93
91 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) { 94 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) {
92 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id)); 95 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id));
93 } 96 }
94 97
95 } // namespace ui; 98 } // namespace ui;
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_mac.mm ('k') | webkit/glue/resources/amex.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698