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

Side by Side Diff: content/browser/browser_main.cc

Issue 7948006: Get rid of content::DidEndMainMessageLoop since it was declared in content but defined in chrome,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 3 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
OLDNEW
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 #include "content/browser/browser_main.h" 5 #include "content/browser/browser_main.h"
6 6
7 #include "base/allocator/allocator_shim.h" 7 #include "base/allocator/allocator_shim.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 160
161 namespace content { 161 namespace content {
162 162
163 BrowserMainParts::BrowserMainParts(const MainFunctionParams& parameters) 163 BrowserMainParts::BrowserMainParts(const MainFunctionParams& parameters)
164 : parameters_(parameters), 164 : parameters_(parameters),
165 parsed_command_line_(parameters.command_line_), 165 parsed_command_line_(parameters.command_line_),
166 result_code_(content::RESULT_CODE_NORMAL_EXIT) { 166 result_code_(content::RESULT_CODE_NORMAL_EXIT) {
167 } 167 }
168 168
169 BrowserMainParts::~BrowserMainParts() { 169 BrowserMainParts::~BrowserMainParts() {
170 #if defined(OS_WIN)
willchan no longer on Chromium 2011/09/19 21:52:49 Looks to me like this should be in BrowserMainPart
jam 2011/09/19 22:13:31 BrowserMainPartsWin is in chrome, but we want this
willchan no longer on Chromium 2011/09/19 22:25:43 Make sense. I suspect we should probably be create
jam 2011/09/19 22:40:48 I avoided that because Chrome also has its own pla
171 OleUninitialize();
172 #endif
170 } 173 }
171 174
172 void BrowserMainParts::EarlyInitialization() { 175 void BrowserMainParts::EarlyInitialization() {
173 PreEarlyInitialization(); 176 PreEarlyInitialization();
174 177
175 #if defined(OS_WIN) 178 #if defined(OS_WIN)
176 net::EnsureWinsockInit(); 179 net::EnsureWinsockInit();
177 #endif 180 #endif
178 181
179 // Use NSS for SSL by default. 182 // Use NSS for SSL by default.
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 base::win::ScopedCOMInitializer com_initializer; 412 base::win::ScopedCOMInitializer com_initializer;
410 #endif // OS_WIN 413 #endif // OS_WIN
411 414
412 base::StatisticsRecorder statistics; 415 base::StatisticsRecorder statistics;
413 416
414 parts->RunMainMessageLoopParts(); 417 parts->RunMainMessageLoopParts();
415 418
416 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 419 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
417 return parts->result_code(); 420 return parts->result_code();
418 } 421 }
OLDNEW
« chrome/browser/chrome_browser_main_mac.mm ('K') | « content/browser/browser_main.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698