diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 16:32:34 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 16:32:34 +0000 |
| commit | bec08d7ad993f82975e0cec80bb9d7e711c38cdd (patch) | |
| tree | 46b513655d993d71fcc434861e16f0af28c39d83 /chrome/test/base/view_event_test_base.h | |
| parent | d8e73bdf182614e9893e898e6358c262ea50a749 (diff) | |
| download | chromium_src-bec08d7ad993f82975e0cec80bb9d7e711c38cdd.zip chromium_src-bec08d7ad993f82975e0cec80bb9d7e711c38cdd.tar.gz chromium_src-bec08d7ad993f82975e0cec80bb9d7e711c38cdd.tar.bz2 | |
Move scoped_ole_initializer.h to ui/base/win and clean up ole initialization/uninitialization.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9664069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/view_event_test_base.h')
| -rw-r--r-- | chrome/test/base/view_event_test_base.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/test/base/view_event_test_base.h b/chrome/test/base/view_event_test_base.h index 8105182..5260ca1 100644 --- a/chrome/test/base/view_event_test_base.h +++ b/chrome/test/base/view_event_test_base.h @@ -20,6 +20,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/widget/widget_delegate.h" +#if defined(OS_WIN) +#include "ui/base/win/scoped_ole_initializer.h" +#endif + namespace gfx { class Size; } @@ -137,6 +141,10 @@ class ViewEventTestBase : public views::WidgetDelegate, content::TestBrowserThread ui_thread_; +#if defined(OS_WIN) + ui::ScopedOleInitializer ole_initializer_; +#endif + DISALLOW_COPY_AND_ASSIGN(ViewEventTestBase); }; |