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

Side by Side Diff: chrome_frame/chrome_tab.cc

Issue 16519003: Define a LoggingSettings struct to use for InitLogging() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error 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/tools/crash_service/main.cc ('k') | chrome_frame/crash_reporting/minidump_test.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) 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 850 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 if (reason == DLL_PROCESS_ATTACH) { 861 if (reason == DLL_PROCESS_ATTACH) {
862 #ifndef NDEBUG 862 #ifndef NDEBUG
863 // Silence traces from the ATL registrar to reduce the log noise. 863 // Silence traces from the ATL registrar to reduce the log noise.
864 ATL::CTrace::s_trace.ChangeCategory(atlTraceRegistrar, 0, 864 ATL::CTrace::s_trace.ChangeCategory(atlTraceRegistrar, 0,
865 ATLTRACESTATUS_DISABLED); 865 ATLTRACESTATUS_DISABLED);
866 #endif 866 #endif
867 InitGoogleUrl(); 867 InitGoogleUrl();
868 868
869 g_exit_manager = new base::AtExitManager(); 869 g_exit_manager = new base::AtExitManager();
870 CommandLine::Init(0, NULL); 870 CommandLine::Init(0, NULL);
871 logging::InitLogging( 871 logging::LoggingSettings settings;
872 NULL, 872 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
873 logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG, 873 logging::InitLogging(settings);
874 logging::LOCK_LOG_FILE,
875 logging::DELETE_OLD_LOG_FILE,
876 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
877 874
878 // Log the same items as Chrome. 875 // Log the same items as Chrome.
879 logging::SetLogItems(true, // enable_process_id 876 logging::SetLogItems(true, // enable_process_id
880 true, // enable_thread_id 877 true, // enable_thread_id
881 false, // enable_timestamp 878 false, // enable_timestamp
882 true); // enable_tickcount 879 true); // enable_tickcount
883 880
884 DllRedirector* dll_redirector = DllRedirector::GetInstance(); 881 DllRedirector* dll_redirector = DllRedirector::GetInstance();
885 DCHECK(dll_redirector); 882 DCHECK(dll_redirector);
886 883
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 HRESULT hr = CustomRegistration(ALL, FALSE, false); 974 HRESULT hr = CustomRegistration(ALL, FALSE, false);
978 return hr; 975 return hr;
979 } 976 }
980 977
981 // Object entries go here instead of with each object, so that we can move 978 // Object entries go here instead of with each object, so that we can move
982 // the objects to a lib. Also reduces magic. 979 // the objects to a lib. Also reduces magic.
983 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho) 980 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho)
984 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument) 981 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument)
985 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex) 982 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex)
986 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol) 983 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol)
OLDNEW
« no previous file with comments | « chrome/tools/crash_service/main.cc ('k') | chrome_frame/crash_reporting/minidump_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698