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

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

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more errors Created 5 years, 4 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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/extensions/api/automation_internal/automation_action_ad apter.h" 10 #include "chrome/browser/extensions/api/automation_internal/automation_action_ad apter.h"
11 #include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h" 11 #include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h"
12 #include "ui/accessibility/ax_tree_serializer.h" 12 #include "ui/accessibility/ax_tree_serializer.h"
13 #include "ui/views/focus/widget_focus_manager.h" 13 #include "ui/views/focus/widget_focus_manager.h"
14 14
15 namespace base {
15 template <typename T> 16 template <typename T>
16 struct DefaultSingletonTraits; 17 struct DefaultSingletonTraits;
18 } // namespace base
17 19
18 namespace content { 20 namespace content {
19 class BrowserContext; 21 class BrowserContext;
20 } // namespace content 22 } // namespace content
21 23
22 namespace views { 24 namespace views {
23 class AXAuraObjWrapper; 25 class AXAuraObjWrapper;
24 class View; 26 class View;
25 } // namespace views 27 } // namespace views
26 28
(...skipping 24 matching lines...) Expand all
51 void DoDefault(int32 id) override; 53 void DoDefault(int32 id) override;
52 void Focus(int32 id) override; 54 void Focus(int32 id) override;
53 void MakeVisible(int32 id) override; 55 void MakeVisible(int32 id) override;
54 void SetSelection(int32 id, int32 start, int32 end) override; 56 void SetSelection(int32 id, int32 start, int32 end) override;
55 void ShowContextMenu(int32 id) override; 57 void ShowContextMenu(int32 id) override;
56 58
57 protected: 59 protected:
58 ~AutomationManagerAura() override; 60 ~AutomationManagerAura() override;
59 61
60 private: 62 private:
61 friend struct DefaultSingletonTraits<AutomationManagerAura>; 63 friend struct base::DefaultSingletonTraits<AutomationManagerAura>;
62 64
63 AutomationManagerAura(); 65 AutomationManagerAura();
64 66
65 // Reset all state in this manager. 67 // Reset all state in this manager.
66 void ResetSerializer(); 68 void ResetSerializer();
67 69
68 void SendEvent(content::BrowserContext* context, 70 void SendEvent(content::BrowserContext* context,
69 views::AXAuraObjWrapper* aura_obj, 71 views::AXAuraObjWrapper* aura_obj,
70 ui::AXEvent event_type); 72 ui::AXEvent event_type);
71 73
(...skipping 15 matching lines...) Expand all
87 bool processing_events_; 89 bool processing_events_;
88 90
89 std::vector<std::pair<views::AXAuraObjWrapper*, ui::AXEvent>> pending_events_; 91 std::vector<std::pair<views::AXAuraObjWrapper*, ui::AXEvent>> pending_events_;
90 92
91 aura::Window* focused_window_; 93 aura::Window* focused_window_;
92 94
93 DISALLOW_COPY_AND_ASSIGN(AutomationManagerAura); 95 DISALLOW_COPY_AND_ASSIGN(AutomationManagerAura);
94 }; 96 };
95 97
96 #endif // CHROME_BROWSER_UI_AURA_ACCESSIBILITY_AUTOMATION_MANAGER_AURA_H_ 98 #endif // CHROME_BROWSER_UI_AURA_ACCESSIBILITY_AUTOMATION_MANAGER_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698