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

Side by Side Diff: ui/views/accessibility/native_view_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: Update license header in atl_module.h 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
« base/win/atl_module.h ('K') | « ui/ui.gyp ('k') | no next file » | 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 "ui/views/accessibility/native_view_accessibility_win.h" 5 #include "ui/views/accessibility/native_view_accessibility_win.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <UIAutomationClient.h> 9 #include <UIAutomationClient.h>
10 10
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/win/accessibility_misc_utils.h" 13 #include "base/win/accessibility_misc_utils.h"
14 #include "base/win/atl_module.h"
14 #include "base/win/windows_version.h" 15 #include "base/win/windows_version.h"
15 #include "third_party/iaccessible2/ia2_api_all.h" 16 #include "third_party/iaccessible2/ia2_api_all.h"
16 #include "ui/base/accessibility/accessible_text_utils.h" 17 #include "ui/base/accessibility/accessible_text_utils.h"
17 #include "ui/base/accessibility/accessible_view_state.h" 18 #include "ui/base/accessibility/accessible_view_state.h"
18 #include "ui/base/view_prop.h" 19 #include "ui/base/view_prop.h"
19 #include "ui/base/win/atl_module.h"
20 #include "ui/views/controls/button/custom_button.h" 20 #include "ui/views/controls/button/custom_button.h"
21 #include "ui/views/widget/native_widget_win.h" 21 #include "ui/views/widget/native_widget_win.h"
22 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
23 23
24 using ui::AccessibilityTypes; 24 using ui::AccessibilityTypes;
25 25
26 // static 26 // static
27 long NativeViewAccessibilityWin::next_unique_id_ = 1; 27 long NativeViewAccessibilityWin::next_unique_id_ = 1;
28 28
29 // static 29 // static
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 const string16& text, 1088 const string16& text,
1089 IA2TextBoundaryType ia2_boundary, 1089 IA2TextBoundaryType ia2_boundary,
1090 LONG start_offset, 1090 LONG start_offset,
1091 ui::TextBoundaryDirection direction) { 1091 ui::TextBoundaryDirection direction) {
1092 HandleSpecialTextOffset(text, &start_offset); 1092 HandleSpecialTextOffset(text, &start_offset);
1093 ui::TextBoundaryType boundary = IA2TextBoundaryToTextBoundary(ia2_boundary); 1093 ui::TextBoundaryType boundary = IA2TextBoundaryToTextBoundary(ia2_boundary);
1094 std::vector<int32> line_breaks; 1094 std::vector<int32> line_breaks;
1095 return ui::FindAccessibleTextBoundary( 1095 return ui::FindAccessibleTextBoundary(
1096 text, line_breaks, boundary, start_offset, direction); 1096 text, line_breaks, boundary, start_offset, direction);
1097 } 1097 }
OLDNEW
« base/win/atl_module.h ('K') | « ui/ui.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698