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

Side by Side Diff: ui/views/accessibility/native_view_accessibility_win.cc

Issue 347743002: Proper fix for accessibility in Windows 64 build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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
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 <oleacc.h> 7 #include <oleacc.h>
8 #include <UIAutomationClient.h> 8 #include <UIAutomationClient.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 12 matching lines...) Expand all
23 #include "ui/base/win/atl_module.h" 23 #include "ui/base/win/atl_module.h"
24 #include "ui/views/controls/button/custom_button.h" 24 #include "ui/views/controls/button/custom_button.h"
25 #include "ui/views/focus/focus_manager.h" 25 #include "ui/views/focus/focus_manager.h"
26 #include "ui/views/focus/view_storage.h" 26 #include "ui/views/focus/view_storage.h"
27 #include "ui/views/widget/widget.h" 27 #include "ui/views/widget/widget.h"
28 #include "ui/views/win/hwnd_util.h" 28 #include "ui/views/win/hwnd_util.h"
29 29
30 namespace views { 30 namespace views {
31 namespace { 31 namespace {
32 32
33 // A version of the OBJID_CLIENT constant that works in 64-bit mode too.
34 static const LPARAM kObjIdClient = static_cast<ULONG>(OBJID_CLIENT);
35
36 class AccessibleWebViewRegistry { 33 class AccessibleWebViewRegistry {
37 public: 34 public:
38 static AccessibleWebViewRegistry* GetInstance(); 35 static AccessibleWebViewRegistry* GetInstance();
39 36
40 void RegisterWebView(View* web_view); 37 void RegisterWebView(View* web_view);
41 38
42 void UnregisterWebView(View* web_view); 39 void UnregisterWebView(View* web_view);
43 40
44 // Given the view that received the request for the accessible 41 // Given the view that received the request for the accessible
45 // id in |top_view|, and the child id requested, return the native 42 // id in |top_view|, and the child id requested, return the native
(...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1498 if (view == NULL || view == view_) { 1495 if (view == NULL || view == view_) {
1499 alert_target_view_storage_ids_.erase( 1496 alert_target_view_storage_ids_.erase(
1500 alert_target_view_storage_ids_.begin() + i); 1497 alert_target_view_storage_ids_.begin() + i);
1501 } else { 1498 } else {
1502 ++i; 1499 ++i;
1503 } 1500 }
1504 } 1501 }
1505 } 1502 }
1506 1503
1507 } // namespace views 1504 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698