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

Unified Diff: ui/views/accessibility/native_view_accessibility_win.cc

Issue 8467002: Fix double-initialization of CComModule. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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/ui.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/accessibility/native_view_accessibility_win.cc
===================================================================
--- ui/views/accessibility/native_view_accessibility_win.cc (revision 109901)
+++ ui/views/accessibility/native_view_accessibility_win.cc (working copy)
@@ -13,6 +13,7 @@
#include "ui/base/accessibility/accessible_text_utils.h"
#include "ui/base/accessibility/accessible_view_state.h"
#include "ui/base/view_prop.h"
+#include "ui/base/win/atl_module.h"
#include "views/widget/native_widget_win.h"
#include "views/widget/widget.h"
@@ -24,6 +25,9 @@
// static
scoped_refptr<NativeViewAccessibilityWin> NativeViewAccessibilityWin::Create(
views::View* view) {
+ // Make sure ATL is initialized in this module.
+ ui::win::CreateATLModuleIfNeeded();
+
CComObject<NativeViewAccessibilityWin>* instance = NULL;
HRESULT hr = CComObject<NativeViewAccessibilityWin>::CreateInstance(
&instance);
« no previous file with comments | « ui/ui.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698