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

Side by Side Diff: content/browser/accessibility/browser_accessibility_win.cc

Issue 15971005: Move the WebCursor sources from webkit/glue to webkit/common/cursors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 | 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 #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"
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 if (parent == NULL) { 490 if (parent == NULL) {
491 // This happens if we're the root of the tree; 491 // This happens if we're the root of the tree;
492 // return the IAccessible for the window. 492 // return the IAccessible for the window.
493 parent = manager_->ToBrowserAccessibilityManagerWin()->parent_iaccessible(); 493 parent = manager_->ToBrowserAccessibilityManagerWin()->parent_iaccessible();
494 // |parent| can only be NULL if the manager was created before the parent 494 // |parent| can only be NULL if the manager was created before the parent
495 // IAccessible was known and it wasn't subsequently set before a client 495 // IAccessible was known and it wasn't subsequently set before a client
496 // requested it. Crash hard if this happens so that we get crash reports. 496 // requested it. Crash hard if this happens so that we get crash reports.
497 CHECK(parent); 497 CHECK(parent);
498 } 498 }
499 499
500 if (!parent)
501 return E_FAIL;
jamesr 2013/05/29 00:28:11 is this change related?
ananta 2013/05/29 00:34:44 No. Gone
500 parent->AddRef(); 502 parent->AddRef();
501 *disp_parent = parent; 503 *disp_parent = parent;
502 return S_OK; 504 return S_OK;
503 } 505 }
504 506
505 STDMETHODIMP BrowserAccessibilityWin::get_accRole(VARIANT var_id, 507 STDMETHODIMP BrowserAccessibilityWin::get_accRole(VARIANT var_id,
506 VARIANT* role) { 508 VARIANT* role) {
507 if (!instance_active_) 509 if (!instance_active_)
508 return E_FAIL; 510 return E_FAIL;
509 511
(...skipping 3094 matching lines...) Expand 10 before | Expand all | Expand 10 after
3604 // The role should always be set. 3606 // The role should always be set.
3605 DCHECK(!role_name_.empty() || ia_role_); 3607 DCHECK(!role_name_.empty() || ia_role_);
3606 3608
3607 // If we didn't explicitly set the IAccessible2 role, make it the same 3609 // If we didn't explicitly set the IAccessible2 role, make it the same
3608 // as the MSAA role. 3610 // as the MSAA role.
3609 if (!ia2_role_) 3611 if (!ia2_role_)
3610 ia2_role_ = ia_role_; 3612 ia2_role_ = ia_role_;
3611 } 3613 }
3612 3614
3613 } // namespace content 3615 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698