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

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

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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/shell_delegate_mus.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>
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 std::unique_ptr<views::AuraInit> aura_init_; 77 std::unique_ptr<views::AuraInit> aura_init_;
78 78
79 std::unique_ptr<ui::Gpu> gpu_; 79 std::unique_ptr<ui::Gpu> gpu_;
80 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; 80 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
81 std::unique_ptr<WindowManager> window_manager_; 81 std::unique_ptr<WindowManager> window_manager_;
82 82
83 // A blocking pool used by the WindowManager's shell; not used in tests. 83 // A blocking pool used by the WindowManager's shell; not used in tests.
84 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 84 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
85 85
86 #if defined(OS_CHROMEOS)
87 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_; 86 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_;
88 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> 87 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider>
89 statistics_provider_; 88 statistics_provider_;
90 #endif
91 89
92 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 90 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
93 }; 91 };
94 92
95 } // namespace mus 93 } // namespace mus
96 } // namespace ash 94 } // namespace ash
97 95
98 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 96 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698