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

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

Issue 10686005: Add methods to add DataPack from open files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
« no previous file with comments | « ui/base/resource/resource_bundle_unittest.cc ('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 30 matching lines...) Expand all
41 41
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 AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"), 51 AddDataPackFromPath(
52 SCALE_FACTOR_100P); 52 GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
53 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"), 53 SCALE_FACTOR_100P);
54 SCALE_FACTOR_100P); 54 AddDataPackFromPath(
55 GetResourcesPakFilePath("ui_resources_standard.pak"),
56 SCALE_FACTOR_100P);
55 break; 57 break;
56 default: 58 default:
57 if (use_hidpi) { 59 if (use_hidpi) {
58 AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"), 60 AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
59 SCALE_FACTOR_200P); 61 SCALE_FACTOR_200P);
60 AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"), 62 AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
61 SCALE_FACTOR_200P); 63 SCALE_FACTOR_200P);
62 } else { 64 } else {
63 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"), 65 AddDataPackFromPath(
64 SCALE_FACTOR_100P); 66 GetResourcesPakFilePath("theme_resources_standard.pak"),
65 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"), 67 SCALE_FACTOR_100P);
66 SCALE_FACTOR_100P); 68 AddDataPackFromPath(
69 GetResourcesPakFilePath("ui_resources_standard.pak"),
70 SCALE_FACTOR_100P);
67 } 71 }
68 break; 72 break;
69 } 73 }
70 } 74 }
71 75
72 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { 76 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
73 // Flipped image is not used on Windows. 77 // Flipped image is not used on Windows.
74 DCHECK_EQ(rtl, RTL_DISABLED); 78 DCHECK_EQ(rtl, RTL_DISABLED);
75 79
76 // Windows only uses SkBitmap for gfx::Image, so this is the same as 80 // Windows only uses SkBitmap for gfx::Image, so this is the same as
77 // GetImageNamed. 81 // GetImageNamed.
78 return GetImageNamed(resource_id); 82 return GetImageNamed(resource_id);
79 } 83 }
80 84
81 void SetResourcesDataDLL(HINSTANCE handle) { 85 void SetResourcesDataDLL(HINSTANCE handle) {
82 resources_data_dll = handle; 86 resources_data_dll = handle;
83 } 87 }
84 88
85 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) { 89 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) {
86 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id)); 90 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id));
87 } 91 }
88 92
89 } // namespace ui; 93 } // namespace ui;
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_unittest.cc ('k') | ui/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698