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

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

Issue 10806018: Revert 147288 - Renamed resource files to be more verbose, specifically: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
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 | Annotate | Revision Log
« no previous file with comments | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/strings/ui_strings.gyp » ('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("theme_resources_touch_1x.pak"),
53 SCALE_FACTOR_100P); 53 SCALE_FACTOR_100P);
54 AddDataPackFromPath( 54 AddDataPackFromPath(
55 GetResourcesPakFilePath("ui_resources_100_percent.pak"), 55 GetResourcesPakFilePath("ui_resources_standard.pak"),
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("theme_resources_2x.pak"),
61 "theme_resources_200_percent.pak"),
62 SCALE_FACTOR_200P); 61 SCALE_FACTOR_200P);
63 AddDataPackFromPath(GetResourcesPakFilePath( 62 AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
64 "ui_resources_200_percent.pak"),
65 SCALE_FACTOR_200P); 63 SCALE_FACTOR_200P);
66 } else { 64 } else {
67 AddDataPackFromPath( 65 AddDataPackFromPath(
68 GetResourcesPakFilePath("theme_resources_100_percent.pak"), 66 GetResourcesPakFilePath("theme_resources_standard.pak"),
69 SCALE_FACTOR_100P); 67 SCALE_FACTOR_100P);
70 AddDataPackFromPath( 68 AddDataPackFromPath(
71 GetResourcesPakFilePath("ui_resources_100_percent.pak"), 69 GetResourcesPakFilePath("ui_resources_standard.pak"),
72 SCALE_FACTOR_100P); 70 SCALE_FACTOR_100P);
73 } 71 }
74 break; 72 break;
75 } 73 }
76 } 74 }
77 75
78 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { 76 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
79 // Flipped image is not used on Windows. 77 // Flipped image is not used on Windows.
80 DCHECK_EQ(rtl, RTL_DISABLED); 78 DCHECK_EQ(rtl, RTL_DISABLED);
81 79
82 // 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
83 // GetImageNamed. 81 // GetImageNamed.
84 return GetImageNamed(resource_id); 82 return GetImageNamed(resource_id);
85 } 83 }
86 84
87 void SetResourcesDataDLL(HINSTANCE handle) { 85 void SetResourcesDataDLL(HINSTANCE handle) {
88 resources_data_dll = handle; 86 resources_data_dll = handle;
89 } 87 }
90 88
91 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) { 89 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) {
92 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id)); 90 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id));
93 } 91 }
94 92
95 } // namespace ui; 93 } // namespace ui;
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/strings/ui_strings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698