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

Side by Side Diff: content/browser/accessibility/browser_accessibility_win.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 unified diff | Download patch
« no previous file with comments | « base/win/accessibility_misc_utils.cc ('k') | ui/base/win/accessibility_misc_utils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/accessibility/browser_accessibility_win.h" 5 #include "content/browser/accessibility/browser_accessibility_win.h"
6 6
7 #include <UIAutomationClient.h> 7 #include <UIAutomationClient.h>
8 #include <UIAutomationCoreApi.h> 8 #include <UIAutomationCoreApi.h>
9 9
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "base/win/accessibility_misc_utils.h"
14 #include "base/win/enum_variant.h" 13 #include "base/win/enum_variant.h"
15 #include "base/win/scoped_comptr.h" 14 #include "base/win/scoped_comptr.h"
16 #include "base/win/windows_version.h" 15 #include "base/win/windows_version.h"
17 #include "content/browser/accessibility/browser_accessibility_manager_win.h" 16 #include "content/browser/accessibility/browser_accessibility_manager_win.h"
18 #include "content/common/accessibility_messages.h" 17 #include "content/common/accessibility_messages.h"
19 #include "net/base/escape.h" 18 #include "net/base/escape.h"
20 #include "ui/base/accessibility/accessible_text_utils.h" 19 #include "ui/base/accessibility/accessible_text_utils.h"
20 #include "ui/base/win/accessibility_misc_utils.h"
21 21
22 using webkit_glue::WebAccessibility; 22 using webkit_glue::WebAccessibility;
23 23
24 // The GUID for the ISimpleDOM service is not defined in the IDL files. 24 // The GUID for the ISimpleDOM service is not defined in the IDL files.
25 // This is taken directly from the Mozilla sources 25 // This is taken directly from the Mozilla sources
26 // (accessible/src/msaa/nsAccessNodeWrap.cpp) and it's also documented at: 26 // (accessible/src/msaa/nsAccessNodeWrap.cpp) and it's also documented at:
27 // http://developer.mozilla.org/en/Accessibility/AT-APIs/ImplementationFeatures/ MSAA 27 // http://developer.mozilla.org/en/Accessibility/AT-APIs/ImplementationFeatures/ MSAA
28 28
29 const GUID GUID_ISimpleDOM = { 29 const GUID GUID_ISimpleDOM = {
30 0x0c539790, 0x12e4, 0x11cf, 30 0x0c539790, 0x12e4, 0x11cf,
(...skipping 3356 matching lines...) Expand 10 before | Expand all | Expand 10 after
3387 } 3387 }
3388 3388
3389 // The role should always be set. 3389 // The role should always be set.
3390 DCHECK(!role_name_.empty() || ia_role_); 3390 DCHECK(!role_name_.empty() || ia_role_);
3391 3391
3392 // If we didn't explicitly set the IAccessible2 role, make it the same 3392 // If we didn't explicitly set the IAccessible2 role, make it the same
3393 // as the MSAA role. 3393 // as the MSAA role.
3394 if (!ia2_role_) 3394 if (!ia2_role_)
3395 ia2_role_ = ia_role_; 3395 ia2_role_ = ia_role_;
3396 } 3396 }
OLDNEW
« no previous file with comments | « base/win/accessibility_misc_utils.cc ('k') | ui/base/win/accessibility_misc_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698