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

Unified Diff: content/browser/browser_main_loop.cc

Issue 9664069: Move scoped_ole_initializer.h to ui/base/win and clean up ole initialization/uninitialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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_loop.h ('k') | ui/aura/test/aura_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 15006c424c1a5717d588e8f482fa170a99e963d0..045295094003cae7c80c290861cb5495070213dd 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -47,7 +47,6 @@
#if defined(OS_WIN)
#include <windows.h>
#include <commctrl.h>
-#include <ole2.h>
#include <shellapi.h>
#include "content/browser/system_message_window_win.h"
@@ -217,17 +216,11 @@ BrowserMainLoop::BrowserMainLoop(const content::MainFunctionParams& parameters)
result_code_(content::RESULT_CODE_NORMAL_EXIT) {
DCHECK(!g_current_browser_main_loop);
g_current_browser_main_loop = this;
-#if defined(OS_WIN)
- OleInitialize(NULL);
-#endif
}
BrowserMainLoop::~BrowserMainLoop() {
DCHECK_EQ(this, g_current_browser_main_loop);
g_current_browser_main_loop = NULL;
-#if defined(OS_WIN)
- OleUninitialize();
-#endif
}
void BrowserMainLoop::Init() {
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | ui/aura/test/aura_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698