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

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

Issue 196133012: Fix incorrect use of AXState caused when refactoring two enums into one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add dependency Created 6 years, 9 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 | Annotate | Revision Log
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 #ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_ 5 #ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
6 #define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_ 6 #define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 #include <oleacc.h> 10 #include <oleacc.h>
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 return E_NOTIMPL; 330 return E_NOTIMPL;
331 } 331 }
332 332
333 STDMETHODIMP get_HostRawElementProvider( 333 STDMETHODIMP get_HostRawElementProvider(
334 IRawElementProviderSimple** provider) { 334 IRawElementProviderSimple** provider) {
335 return E_NOTIMPL; 335 return E_NOTIMPL;
336 } 336 }
337 337
338 // Static methods 338 // Static methods
339 339
340 // Returns a conversion from the event (as defined in accessibility_types.h) 340 // Returns a conversion from the event (as defined in ax_enums.idl)
341 // to an MSAA event. 341 // to an MSAA event.
342 static int32 MSAAEvent(ui::AXEvent event); 342 static int32 MSAAEvent(ui::AXEvent event);
343 343
344 // Returns a conversion from the Role (as defined in accessibility_types.h) 344 // Returns a conversion from the Role (as defined in ax_enums.idl)
345 // to an MSAA role. 345 // to an MSAA role.
346 static int32 MSAARole(ui::AXRole role); 346 static int32 MSAARole(ui::AXRole role);
347 347
348 // Returns a conversion from the State (as defined in accessibility_types.h) 348 // Returns a conversion from the State (as defined in ax_enums.idl)
349 // to MSAA states set. 349 // to MSAA states set.
350 static int32 MSAAState(uint32 state); 350 static int32 MSAAState(const ui::AXViewState& state);
351 351
352 protected: 352 protected:
353 NativeViewAccessibilityWin(); 353 NativeViewAccessibilityWin();
354 354
355 const View* view() const { return view_; } 355 const View* view() const { return view_; }
356 356
357 private: 357 private:
358 // Determines navigation direction for accNavigate, based on left, up and 358 // Determines navigation direction for accNavigate, based on left, up and
359 // previous being mapped all to previous and right, down, next being mapped 359 // previous being mapped all to previous and right, down, next being mapped
360 // to next. Returns true if navigation direction is next, false otherwise. 360 // to next. Returns true if navigation direction is next, false otherwise.
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 417
418 // Next index into |view_storage_ids_| to use. 418 // Next index into |view_storage_ids_| to use.
419 static int next_view_storage_id_index_; 419 static int next_view_storage_id_index_;
420 420
421 DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibilityWin); 421 DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibilityWin);
422 }; 422 };
423 423
424 } // namespace views 424 } // namespace views
425 425
426 #endif // UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_ 426 #endif // UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698