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

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

Issue 2694623016: chromeos: Makes AshTestBase/Helper target mash when appropriate (Closed)
Patch Set: feedback Created 3 years, 10 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/mus/window_manager.cc ('k') | ash/mus/window_manager_unittest.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>
(...skipping 19 matching lines...) Expand all
30 namespace system { 30 namespace system {
31 class ScopedFakeStatisticsProvider; 31 class ScopedFakeStatisticsProvider;
32 } 32 }
33 } 33 }
34 34
35 namespace views { 35 namespace views {
36 class AuraInit; 36 class AuraInit;
37 } 37 }
38 38
39 namespace ash { 39 namespace ash {
40 namespace test {
41 class AshTestHelper;
42 }
40 namespace mus { 43 namespace mus {
41 44
42 class NetworkConnectDelegateMus; 45 class NetworkConnectDelegateMus;
43 class WindowManager; 46 class WindowManager;
44 47
45 // Hosts the window manager and the ash system user interface for mash. 48 // Hosts the window manager and the ash system user interface for mash.
46 class WindowManagerApplication : public service_manager::Service { 49 class WindowManagerApplication : public service_manager::Service {
47 public: 50 public:
48 WindowManagerApplication(); 51 WindowManagerApplication();
49 ~WindowManagerApplication() override; 52 ~WindowManagerApplication() override;
50 53
51 WindowManager* window_manager() { return window_manager_.get(); } 54 WindowManager* window_manager() { return window_manager_.get(); }
52 55
53 private: 56 private:
57 friend class ash::test::AshTestHelper;
54 friend class WmTestBase; 58 friend class WmTestBase;
55 friend class WmTestHelper; 59 friend class WmTestHelper;
56 60
57 void InitWindowManager( 61 void InitWindowManager(
58 std::unique_ptr<aura::WindowTreeClient> window_tree_client, 62 std::unique_ptr<aura::WindowTreeClient> window_tree_client,
59 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool); 63 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool);
60 64
61 // Initializes lower-level OS-specific components (e.g. D-Bus services). 65 // Initializes lower-level OS-specific components (e.g. D-Bus services).
62 void InitializeComponents(); 66 void InitializeComponents();
63 void ShutdownComponents(); 67 void ShutdownComponents();
(...skipping 16 matching lines...) Expand all
80 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> 84 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider>
81 statistics_provider_; 85 statistics_provider_;
82 86
83 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 87 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
84 }; 88 };
85 89
86 } // namespace mus 90 } // namespace mus
87 } // namespace ash 91 } // namespace ash
88 92
89 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 93 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698