| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 821 InitGoogleUrl(); | 821 InitGoogleUrl(); |
| 822 | 822 |
| 823 g_exit_manager = new base::AtExitManager(); | 823 g_exit_manager = new base::AtExitManager(); |
| 824 CommandLine::Init(0, NULL); | 824 CommandLine::Init(0, NULL); |
| 825 InitializeCrashReporting(); | 825 InitializeCrashReporting(); |
| 826 logging::InitLogging( | 826 logging::InitLogging( |
| 827 NULL, | 827 NULL, |
| 828 logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG, | 828 logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG, |
| 829 logging::LOCK_LOG_FILE, | 829 logging::LOCK_LOG_FILE, |
| 830 logging::DELETE_OLD_LOG_FILE, | 830 logging::DELETE_OLD_LOG_FILE, |
| 831 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); | 831 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS, |
| 832 logging::DISABLE_DLOG_FOR_NON_OFFICIAL_RELEASE_BUILDS); |
| 832 | 833 |
| 833 DllRedirector* dll_redirector = DllRedirector::GetInstance(); | 834 DllRedirector* dll_redirector = DllRedirector::GetInstance(); |
| 834 DCHECK(dll_redirector); | 835 DCHECK(dll_redirector); |
| 835 | 836 |
| 836 if (!dll_redirector->RegisterAsFirstCFModule()) { | 837 if (!dll_redirector->RegisterAsFirstCFModule()) { |
| 837 // Someone else was here first, try and get a pointer to their | 838 // Someone else was here first, try and get a pointer to their |
| 838 // DllGetClassObject export: | 839 // DllGetClassObject export: |
| 839 g_dll_get_class_object_redir_ptr = | 840 g_dll_get_class_object_redir_ptr = |
| 840 dll_redirector->GetDllGetClassObjectPtr(); | 841 dll_redirector->GetDllGetClassObjectPtr(); |
| 841 DCHECK(g_dll_get_class_object_redir_ptr != NULL) | 842 DCHECK(g_dll_get_class_object_redir_ptr != NULL) |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 916 HRESULT hr = CustomRegistration(ALL, FALSE, false); | 917 HRESULT hr = CustomRegistration(ALL, FALSE, false); |
| 917 return hr; | 918 return hr; |
| 918 } | 919 } |
| 919 | 920 |
| 920 // Object entries go here instead of with each object, so that we can move | 921 // Object entries go here instead of with each object, so that we can move |
| 921 // the objects to a lib. Also reduces magic. | 922 // the objects to a lib. Also reduces magic. |
| 922 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho) | 923 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho) |
| 923 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument) | 924 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument) |
| 924 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex) | 925 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex) |
| 925 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol) | 926 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol) |
| OLD | NEW |