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

Unified Diff: ui/base/win/accessibility_misc_utils.cc

Issue 10399084: Fix crash in the accessibility code in the shared build. The problem is that the ATL module pointer… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Moved accessibility_misc_utils.h to ui/base/win and switched STDMETHODIMP->STDMETHOD in the header … Created 8 years, 7 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/base/win/accessibility_misc_utils.h ('k') | ui/ui.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/win/accessibility_misc_utils.cc
diff --git a/base/win/accessibility_misc_utils.cc b/ui/base/win/accessibility_misc_utils.cc
similarity index 84%
rename from base/win/accessibility_misc_utils.cc
rename to ui/base/win/accessibility_misc_utils.cc
index 2eec3ccd50fc8435e41649dfed9d283b98eb4f7c..5074ce372a7999676e33c31c61a97dd09e8de279 100644
--- a/base/win/accessibility_misc_utils.cc
+++ b/ui/base/win/accessibility_misc_utils.cc
@@ -1,9 +1,10 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/win/accessibility_misc_utils.h"
+#include "ui/base/win/accessibility_misc_utils.h"
#include "base/logging.h"
+#include "ui/base/win/atl_module.h"
namespace base {
namespace win {
@@ -14,6 +15,9 @@ UIATextProvider::UIATextProvider()
// static
bool UIATextProvider::CreateTextProvider(bool editable, IUnknown** provider) {
+ // Make sure ATL is initialized in this module.
+ ui::win::CreateATLModuleIfNeeded();
+
CComObject<UIATextProvider>* text_provider = NULL;
HRESULT hr = CComObject<UIATextProvider>::CreateInstance(&text_provider);
if (SUCCEEDED(hr)) {
« no previous file with comments | « ui/base/win/accessibility_misc_utils.h ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698