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

Side by Side Diff: chrome_frame/chrome_tab.cc

Issue 71963002: Fix compilation on 2013 debug due to ATL changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | « no previous file | no next file » | 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 // chrome_tab.cc : Implementation of DLL Exports. 5 // chrome_tab.cc : Implementation of DLL Exports.
6 6
7 // Need to include this before the ATL headers below. 7 // Need to include this before the ATL headers below.
8 #include "chrome_frame/chrome_tab.h" 8 #include "chrome_frame/chrome_tab.h"
9 9
10 #include <atlsecurity.h> 10 #include <atlsecurity.h>
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 } 886 }
887 887
888 } // namespace 888 } // namespace
889 889
890 // DLL Entry Point 890 // DLL Entry Point
891 extern "C" BOOL WINAPI DllMain(HINSTANCE instance, 891 extern "C" BOOL WINAPI DllMain(HINSTANCE instance,
892 DWORD reason, 892 DWORD reason,
893 LPVOID reserved) { 893 LPVOID reserved) {
894 UNREFERENCED_PARAMETER(instance); 894 UNREFERENCED_PARAMETER(instance);
895 if (reason == DLL_PROCESS_ATTACH) { 895 if (reason == DLL_PROCESS_ATTACH) {
896 #ifndef NDEBUG 896 #if _ATL_VER < 0x0C00 && !defined(NDEBUG)
897 // Silence traces from the ATL registrar to reduce the log noise. 897 // Silence traces from the ATL registrar to reduce the log noise.
898 ATL::CTrace::s_trace.ChangeCategory(atlTraceRegistrar, 0, 898 ATL::CTrace::s_trace.ChangeCategory(atlTraceRegistrar, 0,
899 ATLTRACESTATUS_DISABLED); 899 ATLTRACESTATUS_DISABLED);
900 #endif 900 #endif
901 InitGoogleUrl(); 901 InitGoogleUrl();
902 902
903 g_exit_manager = new base::AtExitManager(); 903 g_exit_manager = new base::AtExitManager();
904 CommandLine::Init(0, NULL); 904 CommandLine::Init(0, NULL);
905 logging::LoggingSettings settings; 905 logging::LoggingSettings settings;
906 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; 906 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1013 HRESULT hr = CustomRegistration(ALL, FALSE, false); 1013 HRESULT hr = CustomRegistration(ALL, FALSE, false);
1014 return hr; 1014 return hr;
1015 } 1015 }
1016 1016
1017 // Object entries go here instead of with each object, so that we can move 1017 // Object entries go here instead of with each object, so that we can move
1018 // the objects to a lib. Also reduces magic. 1018 // the objects to a lib. Also reduces magic.
1019 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho) 1019 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho)
1020 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument) 1020 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument)
1021 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex) 1021 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex)
1022 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol) 1022 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698