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

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

Issue 23769011: Move a bunch of windows stuff from ui/base/win to ui/gfx/win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moar bustage. Created 7 years, 3 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/layout.cc ('k') | ui/base/text/utf16_indexing.h » ('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/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "ui/base/layout.h" 10 #include "ui/base/layout.h"
11 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/base/resource/resource_data_dll_win.h" 12 #include "ui/base/resource/resource_data_dll_win.h"
13 #include "ui/gfx/dpi_win.h" 13 #include "ui/gfx/win/dpi.h"
14 14
15 namespace ui { 15 namespace ui {
16 16
17 namespace { 17 namespace {
18 18
19 HINSTANCE resources_data_dll; 19 HINSTANCE resources_data_dll;
20 20
21 HINSTANCE GetCurrentResourceDLL() { 21 HINSTANCE GetCurrentResourceDLL() {
22 if (resources_data_dll) 22 if (resources_data_dll)
23 return resources_data_dll; 23 return resources_data_dll;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 void SetResourcesDataDLL(HINSTANCE handle) { 82 void SetResourcesDataDLL(HINSTANCE handle) {
83 resources_data_dll = handle; 83 resources_data_dll = handle;
84 } 84 }
85 85
86 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) { 86 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) {
87 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id)); 87 return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id));
88 } 88 }
89 89
90 } // namespace ui; 90 } // namespace ui;
OLDNEW
« no previous file with comments | « ui/base/layout.cc ('k') | ui/base/text/utf16_indexing.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698