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

Side by Side Diff: chrome_frame/chrome_tab.cc

Issue 6100007: Revert 70782 - Made logging not look up --enable-dcheck from command line... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // Include without path to make GYP build see it. 7 // Include without path to make GYP build see it.
8 #include "chrome_tab.h" // NOLINT 8 #include "chrome_tab.h" // NOLINT
9 9
10 #include <atlsecurity.h> 10 #include <atlsecurity.h>
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 #ifndef NDEBUG 202 #ifndef NDEBUG
203 // Silence traces from the ATL registrar to reduce the log noise. 203 // Silence traces from the ATL registrar to reduce the log noise.
204 ATL::CTrace::s_trace.ChangeCategory(atlTraceRegistrar, 0, 204 ATL::CTrace::s_trace.ChangeCategory(atlTraceRegistrar, 0,
205 ATLTRACESTATUS_DISABLED); 205 ATLTRACESTATUS_DISABLED);
206 #endif 206 #endif
207 InitGoogleUrl(); 207 InitGoogleUrl();
208 208
209 g_exit_manager = new base::AtExitManager(); 209 g_exit_manager = new base::AtExitManager();
210 CommandLine::Init(0, NULL); 210 CommandLine::Init(0, NULL);
211 InitializeCrashReporting(); 211 InitializeCrashReporting();
212 logging::InitLogging( 212 logging::InitLogging(NULL, logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
213 NULL, 213 logging::LOCK_LOG_FILE, logging::DELETE_OLD_LOG_FILE);
214 logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
215 logging::LOCK_LOG_FILE,
216 logging::DELETE_OLD_LOG_FILE,
217 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
218 214
219 DllRedirector* dll_redirector = DllRedirector::GetInstance(); 215 DllRedirector* dll_redirector = DllRedirector::GetInstance();
220 DCHECK(dll_redirector); 216 DCHECK(dll_redirector);
221 217
222 if (!dll_redirector->RegisterAsFirstCFModule()) { 218 if (!dll_redirector->RegisterAsFirstCFModule()) {
223 // Someone else was here first, try and get a pointer to their 219 // Someone else was here first, try and get a pointer to their
224 // DllGetClassObject export: 220 // DllGetClassObject export:
225 g_dll_get_class_object_redir_ptr = 221 g_dll_get_class_object_redir_ptr =
226 dll_redirector->GetDllGetClassObjectPtr(); 222 dll_redirector->GetDllGetClassObjectPtr();
227 DCHECK(g_dll_get_class_object_redir_ptr != NULL) 223 DCHECK(g_dll_get_class_object_redir_ptr != NULL)
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 sd.GetDacl(&new_dacl); 784 sd.GetDacl(&new_dacl);
789 new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ); 785 new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ);
790 if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) { 786 if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) {
791 result = SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE); 787 result = SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE);
792 } 788 }
793 } 789 }
794 790
795 backup.RestoreSecurity(object_name.c_str()); 791 backup.RestoreSecurity(object_name.c_str());
796 return result; 792 return result;
797 } 793 }
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