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

Side by Side Diff: ceee/ie/plugin/toolband/toolband_module.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 | « ceee/ie/broker/broker_module.cc ('k') | ceee/installer_dll/installer_helper.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 // Declaration of ATL module object and DLL exports. 5 // Declaration of ATL module object and DLL exports.
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/atomic_ref_count.h" 8 #include "base/atomic_ref_count.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 // It seems we're obliged to initialize the current command line 92 // It seems we're obliged to initialize the current command line
93 // before initializing logging. This feels a little strange for 93 // before initializing logging. This feels a little strange for
94 // a plugin. 94 // a plugin.
95 CommandLine::Init(0, NULL); 95 CommandLine::Init(0, NULL);
96 96
97 logging::InitLogging( 97 logging::InitLogging(
98 logfile_path, 98 logfile_path,
99 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, 99 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
100 logging::LOCK_LOG_FILE, 100 logging::LOCK_LOG_FILE,
101 logging::APPEND_TO_OLD_LOG_FILE, 101 logging::APPEND_TO_OLD_LOG_FILE);
102 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
103 102
104 // Initialize ETW logging. 103 // Initialize ETW logging.
105 logging::LogEventProvider::Initialize(kCeeeIeLogProviderName); 104 logging::LogEventProvider::Initialize(kCeeeIeLogProviderName);
106 105
107 // Initialize control hosting. 106 // Initialize control hosting.
108 BOOL initialized = AtlAxWinInit(); 107 BOOL initialized = AtlAxWinInit();
109 DCHECK(initialized); 108 DCHECK(initialized);
110 109
111 // Needs to be called before we can use GURL. 110 // Needs to be called before we can use GURL.
112 chrome::RegisterChromeSchemes(); 111 chrome::RegisterChromeSchemes();
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 } 277 }
279 278
280 CEEE_DEFINE_DLL_REGISTER_SERVER() 279 CEEE_DEFINE_DLL_REGISTER_SERVER()
281 280
282 // DllUnregisterServer - Removes entries from the system registry 281 // DllUnregisterServer - Removes entries from the system registry
283 STDAPI DllUnregisterServer(void) { 282 STDAPI DllUnregisterServer(void) {
284 // We always allow unregistration, even if no --ceee install flag. 283 // We always allow unregistration, even if no --ceee install flag.
285 HRESULT hr = module.DllUnregisterServer(); 284 HRESULT hr = module.DllUnregisterServer();
286 return hr; 285 return hr;
287 } 286 }
OLDNEW
« no previous file with comments | « ceee/ie/broker/broker_module.cc ('k') | ceee/installer_dll/installer_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698