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

Side by Side Diff: chrome/app/delay_load_hook_win.cc

Issue 16320010: Use a direct include of strings headers in chrome/app/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « chrome/app/client_util.cc ('k') | chrome/app/hard_error_handler_win.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/app/delay_load_hook_win.h" 5 #include "chrome/app/delay_load_hook_win.h"
6 6
7 #if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700 7 #if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700
8 // The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h, and in 8 // The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h, and in
9 // delayimp.h previous to VS2012. 9 // delayimp.h previous to VS2012.
10 #undef FACILITY_VISUALCPP 10 #undef FACILITY_VISUALCPP
11 #endif 11 #endif
12 #include <DelayIMP.h> 12 #include <DelayIMP.h>
13 13
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 17
18 // So long as these symbols are supplied to the final binary through an 18 // So long as these symbols are supplied to the final binary through an
19 // object file (as opposed to indirectly through a library), these pointers 19 // object file (as opposed to indirectly through a library), these pointers
20 // will override the CRT's symbols and direct the notifications to our hook. 20 // will override the CRT's symbols and direct the notifications to our hook.
21 // Alternatively referencing the ChromeDelayLoadHook function somehow will 21 // Alternatively referencing the ChromeDelayLoadHook function somehow will
22 // cause this declaration of these variables to take preference to the delay 22 // cause this declaration of these variables to take preference to the delay
23 // load runtime's defaults (in delayimp.lib). 23 // load runtime's defaults (in delayimp.lib).
24 PfnDliHook __pfnDliNotifyHook2 = ChromeDelayLoadHook; 24 PfnDliHook __pfnDliNotifyHook2 = ChromeDelayLoadHook;
25 PfnDliHook __pfnDliFailureHook2 = ChromeDelayLoadHook; 25 PfnDliHook __pfnDliFailureHook2 = ChromeDelayLoadHook;
26 26
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 default: 77 default:
78 NOTREACHED() << "Impossible delay load notification."; 78 NOTREACHED() << "Impossible delay load notification.";
79 break; 79 break;
80 } 80 }
81 81
82 // Returning NULL causes the delay load machinery to perform default 82 // Returning NULL causes the delay load machinery to perform default
83 // processing for this notification. 83 // processing for this notification.
84 return NULL; 84 return NULL;
85 } 85 }
OLDNEW
« no previous file with comments | « chrome/app/client_util.cc ('k') | chrome/app/hard_error_handler_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698