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

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

Issue 2847283002: chromeos: convert remaining AshTest usage to AshTestBase (Closed)
Patch Set: comment Created 3 years, 7 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.h ('k') | ash/mus_property_mirror_ash_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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 Config ash_config = Config::MASH, 64 Config ash_config = Config::MASH,
65 std::unique_ptr<ash::ShellDelegate> shell_delegate = nullptr); 65 std::unique_ptr<ash::ShellDelegate> shell_delegate = nullptr);
66 ~WindowManagerApplication() override; 66 ~WindowManagerApplication() override;
67 67
68 WindowManager* window_manager() { return window_manager_.get(); } 68 WindowManager* window_manager() { return window_manager_.get(); }
69 69
70 service_manager::Connector* GetConnector(); 70 service_manager::Connector* GetConnector();
71 71
72 private: 72 private:
73 friend class ash::test::AshTestHelper; 73 friend class ash::test::AshTestHelper;
74 friend class WmTestBase;
75 friend class WmTestHelper;
76 74
77 // If |init_network_handler| is true, chromeos::NetworkHandler is initialized. 75 // If |init_network_handler| is true, chromeos::NetworkHandler is initialized.
78 void InitWindowManager( 76 void InitWindowManager(
79 std::unique_ptr<aura::WindowTreeClient> window_tree_client, 77 std::unique_ptr<aura::WindowTreeClient> window_tree_client,
80 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool, 78 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool,
81 bool init_network_handler); 79 bool init_network_handler);
82 80
83 // Initializes lower-level OS-specific components (e.g. D-Bus services). 81 // Initializes lower-level OS-specific components (e.g. D-Bus services).
84 void InitializeComponents(bool init_network_handler); 82 void InitializeComponents(bool init_network_handler);
85 void ShutdownComponents(); 83 void ShutdownComponents();
(...skipping 25 matching lines...) Expand all
111 109
112 const Config ash_config_; 110 const Config ash_config_;
113 111
114 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 112 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
115 }; 113 };
116 114
117 } // namespace mus 115 } // namespace mus
118 } // namespace ash 116 } // namespace ash
119 117
120 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 118 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/mus/window_manager.h ('k') | ash/mus_property_mirror_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698