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

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

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back out some webrtc files. Created 5 years, 8 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "base/win/scoped_bstr.h" 7 #include "base/win/scoped_bstr.h"
8 #include "base/win/scoped_comptr.h" 8 #include "base/win/scoped_comptr.h"
9 #include "base/win/scoped_variant.h" 9 #include "base/win/scoped_variant.h"
10 #include "content/browser/accessibility/browser_accessibility_manager.h" 10 #include "content/browser/accessibility/browser_accessibility_manager.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 51
52 // CountedBrowserAccessibilityFactory ----------------------------------------- 52 // CountedBrowserAccessibilityFactory -----------------------------------------
53 53
54 // Factory that creates a CountedBrowserAccessibility. 54 // Factory that creates a CountedBrowserAccessibility.
55 class CountedBrowserAccessibilityFactory : public BrowserAccessibilityFactory { 55 class CountedBrowserAccessibilityFactory : public BrowserAccessibilityFactory {
56 public: 56 public:
57 CountedBrowserAccessibilityFactory(); 57 CountedBrowserAccessibilityFactory();
58 58
59 private: 59 private:
60 virtual ~CountedBrowserAccessibilityFactory(); 60 ~CountedBrowserAccessibilityFactory() override;
61 61
62 virtual BrowserAccessibility* Create() override; 62 BrowserAccessibility* Create() override;
63 63
64 DISALLOW_COPY_AND_ASSIGN(CountedBrowserAccessibilityFactory); 64 DISALLOW_COPY_AND_ASSIGN(CountedBrowserAccessibilityFactory);
65 }; 65 };
66 66
67 CountedBrowserAccessibilityFactory::CountedBrowserAccessibilityFactory() { 67 CountedBrowserAccessibilityFactory::CountedBrowserAccessibilityFactory() {
68 } 68 }
69 69
70 CountedBrowserAccessibilityFactory::~CountedBrowserAccessibilityFactory() { 70 CountedBrowserAccessibilityFactory::~CountedBrowserAccessibilityFactory() {
71 } 71 }
72 72
73 BrowserAccessibility* CountedBrowserAccessibilityFactory::Create() { 73 BrowserAccessibility* CountedBrowserAccessibilityFactory::Create() {
74 CComObject<CountedBrowserAccessibility>* instance; 74 CComObject<CountedBrowserAccessibility>* instance;
75 HRESULT hr = CComObject<CountedBrowserAccessibility>::CreateInstance( 75 HRESULT hr = CComObject<CountedBrowserAccessibility>::CreateInstance(
76 &instance); 76 &instance);
77 DCHECK(SUCCEEDED(hr)); 77 DCHECK(SUCCEEDED(hr));
78 instance->AddRef(); 78 instance->AddRef();
79 return instance; 79 return instance;
80 } 80 }
81 81
82 } // namespace 82 } // namespace
83 83
84 84
85 // BrowserAccessibilityTest --------------------------------------------------- 85 // BrowserAccessibilityTest ---------------------------------------------------
86 86
87 class BrowserAccessibilityTest : public testing::Test { 87 class BrowserAccessibilityTest : public testing::Test {
88 public: 88 public:
89 BrowserAccessibilityTest(); 89 BrowserAccessibilityTest();
90 virtual ~BrowserAccessibilityTest(); 90 ~BrowserAccessibilityTest() override;
91 91
92 private: 92 private:
93 virtual void SetUp() override; 93 void SetUp() override;
94 94
95 DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityTest); 95 DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityTest);
96 }; 96 };
97 97
98 BrowserAccessibilityTest::BrowserAccessibilityTest() { 98 BrowserAccessibilityTest::BrowserAccessibilityTest() {
99 } 99 }
100 100
101 BrowserAccessibilityTest::~BrowserAccessibilityTest() { 101 BrowserAccessibilityTest::~BrowserAccessibilityTest() {
102 } 102 }
103 103
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 0L /* selection_index */, &selection_start, &selection_end);; 855 0L /* selection_index */, &selection_start, &selection_end);;
856 EXPECT_EQ(S_OK, hr); 856 EXPECT_EQ(S_OK, hr);
857 EXPECT_EQ(1L, selection_start); 857 EXPECT_EQ(1L, selection_start);
858 EXPECT_EQ(2L, selection_end); 858 EXPECT_EQ(2L, selection_end);
859 859
860 manager.reset(); 860 manager.reset();
861 ASSERT_EQ(0, CountedBrowserAccessibility::num_instances()); 861 ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
862 } 862 }
863 863
864 } // namespace content 864 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/accessibility/browser_accessibility_win.h ('k') | content/browser/compositor/software_output_device_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698