| OLD | NEW |
| 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_mac.h" |
| 6 |
| 5 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 6 | 8 |
| 7 #include "base/memory/scoped_ptr.h" | 9 #include <memory> |
| 10 |
| 8 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 10 #include "content/browser/accessibility/browser_accessibility_cocoa.h" | 13 #include "content/browser/accessibility/browser_accessibility_cocoa.h" |
| 11 #include "content/browser/accessibility/browser_accessibility_mac.h" | |
| 12 #include "content/browser/accessibility/browser_accessibility_manager.h" | 14 #include "content/browser/accessibility/browser_accessibility_manager.h" |
| 13 #include "content/browser/accessibility/browser_accessibility_manager_mac.h" | 15 #include "content/browser/accessibility/browser_accessibility_manager_mac.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 15 #import "testing/gtest_mac.h" | 17 #import "testing/gtest_mac.h" |
| 16 #import "ui/gfx/test/ui_cocoa_test_helper.h" | 18 #import "ui/gfx/test/ui_cocoa_test_helper.h" |
| 17 | 19 |
| 18 namespace content { | 20 namespace content { |
| 19 | 21 |
| 20 class BrowserAccessibilityTest : public ui::CocoaTest { | 22 class BrowserAccessibilityTest : public ui::CocoaTest { |
| 21 public: | 23 public: |
| (...skipping 30 matching lines...) Expand all Loading... |
| 52 manager_.reset( | 54 manager_.reset( |
| 53 new BrowserAccessibilityManagerMac( | 55 new BrowserAccessibilityManagerMac( |
| 54 nil, | 56 nil, |
| 55 MakeAXTreeUpdate(root, child1, child2), | 57 MakeAXTreeUpdate(root, child1, child2), |
| 56 NULL)); | 58 NULL)); |
| 57 accessibility_.reset([ToBrowserAccessibilityCocoa(manager_->GetRoot()) | 59 accessibility_.reset([ToBrowserAccessibilityCocoa(manager_->GetRoot()) |
| 58 retain]); | 60 retain]); |
| 59 } | 61 } |
| 60 | 62 |
| 61 base::scoped_nsobject<BrowserAccessibilityCocoa> accessibility_; | 63 base::scoped_nsobject<BrowserAccessibilityCocoa> accessibility_; |
| 62 scoped_ptr<BrowserAccessibilityManager> manager_; | 64 std::unique_ptr<BrowserAccessibilityManager> manager_; |
| 63 }; | 65 }; |
| 64 | 66 |
| 65 // Standard hit test. | 67 // Standard hit test. |
| 66 TEST_F(BrowserAccessibilityTest, HitTestTest) { | 68 TEST_F(BrowserAccessibilityTest, HitTestTest) { |
| 67 BrowserAccessibilityCocoa* firstChild = | 69 BrowserAccessibilityCocoa* firstChild = |
| 68 [accessibility_ accessibilityHitTest:NSMakePoint(50, 50)]; | 70 [accessibility_ accessibilityHitTest:NSMakePoint(50, 50)]; |
| 69 EXPECT_NSEQ(@"Child1", | 71 EXPECT_NSEQ(@"Child1", |
| 70 [firstChild | 72 [firstChild |
| 71 accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]); | 73 accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]); |
| 72 } | 74 } |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 | 121 |
| 120 // Now any attributes we query should return nil. | 122 // Now any attributes we query should return nil. |
| 121 EXPECT_EQ(nil, [retainedFirstChild | 123 EXPECT_EQ(nil, [retainedFirstChild |
| 122 accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]); | 124 accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]); |
| 123 | 125 |
| 124 // Don't leak memory in the test. | 126 // Don't leak memory in the test. |
| 125 [retainedFirstChild release]; | 127 [retainedFirstChild release]; |
| 126 } | 128 } |
| 127 | 129 |
| 128 } // namespace content | 130 } // namespace content |
| OLD | NEW |