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

Side by Side Diff: ash/mus/window_manager_application.h

Issue 2208783002: Make Tracing Service not use outgoing InterfaceProvider, update conventions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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
« no previous file with comments | « no previous file | ash/mus/window_manager_application.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <set> 11 #include <set>
12 12
13 #include "ash/mus/window_manager_observer.h" 13 #include "ash/mus/window_manager_observer.h"
14 #include "ash/public/interfaces/shelf_layout.mojom.h" 14 #include "ash/public/interfaces/shelf_layout.mojom.h"
15 #include "ash/public/interfaces/user_window_controller.mojom.h" 15 #include "ash/public/interfaces/user_window_controller.mojom.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "mash/session/public/interfaces/session.mojom.h" 17 #include "mash/session/public/interfaces/session.mojom.h"
18 #include "mojo/public/cpp/bindings/binding.h" 18 #include "mojo/public/cpp/bindings/binding.h"
19 #include "mojo/public/cpp/bindings/binding_set.h" 19 #include "mojo/public/cpp/bindings/binding_set.h"
20 #include "services/shell/public/cpp/service.h" 20 #include "services/shell/public/cpp/service.h"
21 #include "services/tracing/public/cpp/tracing_impl.h" 21 #include "services/tracing/public/cpp/provider.h"
22 #include "services/ui/common/types.h" 22 #include "services/ui/common/types.h"
23 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h" 23 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
24 24
25 namespace views { 25 namespace views {
26 class AuraInit; 26 class AuraInit;
27 } 27 }
28 28
29 namespace ui { 29 namespace ui {
30 class Event; 30 class Event;
31 class WindowTreeClient; 31 class WindowTreeClient;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 mojo::InterfaceRequest<ui::mojom::AcceleratorRegistrar> request) override; 82 mojo::InterfaceRequest<ui::mojom::AcceleratorRegistrar> request) override;
83 83
84 // session::mojom::ScreenlockStateListener: 84 // session::mojom::ScreenlockStateListener:
85 void ScreenlockStateChanged(bool locked) override; 85 void ScreenlockStateChanged(bool locked) override;
86 86
87 // WindowManagerObserver: 87 // WindowManagerObserver:
88 void OnRootWindowControllerAdded(RootWindowController* controller) override; 88 void OnRootWindowControllerAdded(RootWindowController* controller) override;
89 void OnWillDestroyRootWindowController( 89 void OnWillDestroyRootWindowController(
90 RootWindowController* controller) override; 90 RootWindowController* controller) override;
91 91
92 mojo::TracingImpl tracing_; 92 tracing::Provider tracing_;
93 93
94 std::unique_ptr<views::AuraInit> aura_init_; 94 std::unique_ptr<views::AuraInit> aura_init_;
95 95
96 // The |shelf_layout_| object is created once OnEmbed() is called. Until that 96 // The |shelf_layout_| object is created once OnEmbed() is called. Until that
97 // time |shelf_layout_requests_| stores pending interface requests. 97 // time |shelf_layout_requests_| stores pending interface requests.
98 std::unique_ptr<ShelfLayoutImpl> shelf_layout_; 98 std::unique_ptr<ShelfLayoutImpl> shelf_layout_;
99 mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_; 99 mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_;
100 std::vector<mojo::InterfaceRequest<mojom::ShelfLayout>> 100 std::vector<mojo::InterfaceRequest<mojom::ShelfLayout>>
101 shelf_layout_requests_; 101 shelf_layout_requests_;
102 102
(...skipping 14 matching lines...) Expand all
117 mojo::Binding<mash::session::mojom::ScreenlockStateListener> 117 mojo::Binding<mash::session::mojom::ScreenlockStateListener>
118 screenlock_state_listener_binding_; 118 screenlock_state_listener_binding_;
119 119
120 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 120 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
121 }; 121 };
122 122
123 } // namespace mus 123 } // namespace mus
124 } // namespace ash 124 } // namespace ash
125 125
126 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 126 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698