| 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
|
|
|