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

Unified Diff: ui/views/examples/examples_main.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 | « ui/views/controls/table/table_view_unittest.cc ('k') | ui/views/test/views_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/examples_main.cc
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index 8ac81439ee9c712901a56af6c2d05918ab2dfaed..e4f778556b257e5856a18803ca1b9c2c94560c0a 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -16,9 +16,13 @@
#include "ui/views/test/test_views_delegate.h"
#include "ui/views/widget/widget.h"
+#if defined(OS_WIN)
+#include "ui/base/win/scoped_ole_initializer.h"
+#endif
+
int main(int argc, char** argv) {
#if defined(OS_WIN)
- OleInitialize(NULL);
+ ui::ScopedOleInitializer ole_initializer;
#elif defined(OS_LINUX)
// Initializes gtk stuff.
g_type_init();
@@ -51,8 +55,5 @@ int main(int argc, char** argv) {
views::AcceleratorHandler accelerator_handler;
MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
-#if defined(OS_WIN)
- OleUninitialize();
-#endif
return 0;
}
« no previous file with comments | « ui/views/controls/table/table_view_unittest.cc ('k') | ui/views/test/views_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698