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

Unified 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: fix 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_main.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main.cc
===================================================================
--- content/browser/browser_main.cc (revision 101872)
+++ content/browser/browser_main.cc (working copy)
@@ -164,9 +164,15 @@
: parameters_(parameters),
parsed_command_line_(parameters.command_line_),
result_code_(content::RESULT_CODE_NORMAL_EXIT) {
+#if defined(OS_WIN)
+ OleInitialize(NULL);
+#endif
}
BrowserMainParts::~BrowserMainParts() {
+#if defined(OS_WIN)
+ OleUninitialize();
+#endif
}
void BrowserMainParts::EarlyInitialization() {
@@ -219,8 +225,6 @@
PreMainMessageLoopStart();
#if defined(OS_WIN)
- OleInitialize(NULL);
-
// If we're running tests (ui_task is non-null), then the ResourceBundle
// has already been initialized.
if (!parameters().ui_task) {
« no previous file with comments | « content/browser/browser_main.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698