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

Side by Side Diff: chrome/browser/ui/aura/accessibility/automation_manager_aura.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROME_BROWSER_UI_AURA_ACCESSIBILITY_AUTOMATION_MANAGER_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_AURA_ACCESSIBILITY_AUTOMATION_MANAGER_AURA_H_
6 #define CHROME_BROWSER_UI_AURA_ACCESSIBILITY_AUTOMATION_MANAGER_AURA_H_ 6 #define CHROME_BROWSER_UI_AURA_ACCESSIBILITY_AUTOMATION_MANAGER_AURA_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "chrome/browser/extensions/api/automation_internal/automation_action_ad apter.h" 13 #include "chrome/browser/extensions/api/automation_internal/automation_action_ad apter.h"
13 #include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h" 14 #include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h"
14 #include "ui/accessibility/ax_tree_serializer.h" 15 #include "ui/accessibility/ax_tree_serializer.h"
15 16
16 namespace base { 17 namespace base {
17 template <typename T> 18 template <typename T>
18 struct DefaultSingletonTraits; 19 struct DefaultSingletonTraits;
19 } // namespace base 20 } // namespace base
20 21
21 namespace content { 22 namespace content {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 void SendEvent(content::BrowserContext* context, 74 void SendEvent(content::BrowserContext* context,
74 views::AXAuraObjWrapper* aura_obj, 75 views::AXAuraObjWrapper* aura_obj,
75 ui::AXEvent event_type); 76 ui::AXEvent event_type);
76 77
77 // Whether automation support for views is enabled. 78 // Whether automation support for views is enabled.
78 bool enabled_; 79 bool enabled_;
79 80
80 // Holds the active views-based accessibility tree. A tree currently consists 81 // Holds the active views-based accessibility tree. A tree currently consists
81 // of all views descendant to a |Widget| (see |AXTreeSourceViews|). 82 // of all views descendant to a |Widget| (see |AXTreeSourceViews|).
82 // A tree becomes active when an event is fired on a descendant view. 83 // A tree becomes active when an event is fired on a descendant view.
83 scoped_ptr<AXTreeSourceAura> current_tree_; 84 std::unique_ptr<AXTreeSourceAura> current_tree_;
84 85
85 // Serializes incremental updates on the currently active tree 86 // Serializes incremental updates on the currently active tree
86 // |current_tree_|. 87 // |current_tree_|.
87 scoped_ptr<AuraAXTreeSerializer> current_tree_serializer_; 88 std::unique_ptr<AuraAXTreeSerializer> current_tree_serializer_;
88 89
89 bool processing_events_; 90 bool processing_events_;
90 91
91 std::vector<std::pair<views::AXAuraObjWrapper*, ui::AXEvent>> pending_events_; 92 std::vector<std::pair<views::AXAuraObjWrapper*, ui::AXEvent>> pending_events_;
92 93
93 DISALLOW_COPY_AND_ASSIGN(AutomationManagerAura); 94 DISALLOW_COPY_AND_ASSIGN(AutomationManagerAura);
94 }; 95 };
95 96
96 #endif // CHROME_BROWSER_UI_AURA_ACCESSIBILITY_AUTOMATION_MANAGER_AURA_H_ 97 #endif // CHROME_BROWSER_UI_AURA_ACCESSIBILITY_AUTOMATION_MANAGER_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/window_positioner_unittest.cc ('k') | chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698