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

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

Issue 2795883002: Eliminate OnConnect usage (Closed)
Patch Set: . Created 3 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
« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | 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/public/interfaces/wallpaper.mojom.h" 13 #include "ash/public/interfaces/wallpaper.mojom.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "mojo/public/cpp/bindings/binding.h" 16 #include "mojo/public/cpp/bindings/binding.h"
17 #include "services/service_manager/public/cpp/binder_registry.h"
17 #include "services/service_manager/public/cpp/service.h" 18 #include "services/service_manager/public/cpp/service.h"
18 #include "services/tracing/public/cpp/provider.h" 19 #include "services/tracing/public/cpp/provider.h"
19 #include "services/ui/common/types.h" 20 #include "services/ui/common/types.h"
20 21
21 namespace aura { 22 namespace aura {
22 class WindowTreeClient; 23 class WindowTreeClient;
23 } 24 }
24 25
25 namespace base { 26 namespace base {
26 class SequencedWorkerPool; 27 class SequencedWorkerPool;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 std::unique_ptr<aura::WindowTreeClient> window_tree_client, 64 std::unique_ptr<aura::WindowTreeClient> window_tree_client,
64 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool, 65 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool,
65 bool init_network_handler); 66 bool init_network_handler);
66 67
67 // Initializes lower-level OS-specific components (e.g. D-Bus services). 68 // Initializes lower-level OS-specific components (e.g. D-Bus services).
68 void InitializeComponents(bool init_network_handler); 69 void InitializeComponents(bool init_network_handler);
69 void ShutdownComponents(); 70 void ShutdownComponents();
70 71
71 // service_manager::Service: 72 // service_manager::Service:
72 void OnStart() override; 73 void OnStart() override;
73 bool OnConnect(const service_manager::ServiceInfo& remote_info, 74 void OnBindInterface(const service_manager::ServiceInfo& source_info,
74 service_manager::InterfaceRegistry* registry) override; 75 const std::string& interface_name,
76 mojo::ScopedMessagePipeHandle interface_pipe) override;
75 77
76 tracing::Provider tracing_; 78 tracing::Provider tracing_;
77 79
78 std::unique_ptr<views::AuraInit> aura_init_; 80 std::unique_ptr<views::AuraInit> aura_init_;
79 81
80 std::unique_ptr<WindowManager> window_manager_; 82 std::unique_ptr<WindowManager> window_manager_;
81 83
82 // A blocking pool used by the WindowManager's shell; not used in tests. 84 // A blocking pool used by the WindowManager's shell; not used in tests.
83 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 85 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
84 86
85 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_; 87 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_;
86 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> 88 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider>
87 statistics_provider_; 89 statistics_provider_;
88 90
91 service_manager::BinderRegistry registry_;
92
89 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 93 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
90 }; 94 };
91 95
92 } // namespace mus 96 } // namespace mus
93 } // namespace ash 97 } // namespace ash
94 98
95 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 99 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698