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

Unified Diff: chrome/browser/browser_main_win.cc

Issue 2931007: BrowserMain() refactoring, part 2. (Closed)
Patch Set: Updated per brettw and merged ToT. Created 10 years, 5 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 | « chrome/browser/browser_main_posix.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main_win.cc
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index 588a76c43cb14c7a53b32221326595501f7ab0d7..b76545a34e0b340aaff330cbea2b73506f5681f4 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -33,10 +33,6 @@
#include "views/focus/accelerator_handler.h"
#include "views/window/window.h"
-void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) {
- OleInitialize(NULL);
-}
-
void DidEndMainMessageLoop() {
OleUninitialize();
}
@@ -211,11 +207,15 @@ class BrowserMainPartsWin : public BrowserMainParts {
explicit BrowserMainPartsWin(const MainFunctionParams& parameters)
: BrowserMainParts(parameters) {}
- private:
+ protected:
virtual void PreEarlyInitialization() {
// Initialize Winsock.
net::EnsureWinsockInit();
}
+
+ virtual void PreMainMessageLoopStart() {
+ OleInitialize(NULL);
+ }
};
// static
« no previous file with comments | « chrome/browser/browser_main_posix.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698