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

Side by Side Diff: ash/shell_init_params.h

Issue 2858563002: Revert of chromeos: Makes mushrome use simplified display management (Closed)
Patch Set: 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/shell.cc ('k') | ash/test/ash_test_base.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SHELL_INIT_PARAMS_H_ 5 #ifndef ASH_SHELL_INIT_PARAMS_H_
6 #define ASH_SHELL_INIT_PARAMS_H_ 6 #define ASH_SHELL_INIT_PARAMS_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 9
10 namespace aura { 10 namespace aura {
(...skipping 11 matching lines...) Expand all
22 namespace ash { 22 namespace ash {
23 23
24 class ShellDelegate; 24 class ShellDelegate;
25 class ShellPort; 25 class ShellPort;
26 26
27 struct ASH_EXPORT ShellInitParams { 27 struct ASH_EXPORT ShellInitParams {
28 // Shell takes ownership of |shell_port|, if null ShellPortClassic is created. 28 // Shell takes ownership of |shell_port|, if null ShellPortClassic is created.
29 ShellPort* shell_port = nullptr; 29 ShellPort* shell_port = nullptr;
30 // Shell takes ownership of |primary_window_tree_host|. This is only used 30 // Shell takes ownership of |primary_window_tree_host|. This is only used
31 // by mash. 31 // by mash.
32 // TODO(sky): once simplified display management is enabled for mash this
33 // should no longer be necessary. http://crbug.com/708287.
34 aura::WindowTreeHostMus* primary_window_tree_host = nullptr; 32 aura::WindowTreeHostMus* primary_window_tree_host = nullptr;
35 ShellDelegate* delegate = nullptr; 33 ShellDelegate* delegate = nullptr;
36 ui::ContextFactory* context_factory = nullptr; 34 ui::ContextFactory* context_factory = nullptr;
37 ui::ContextFactoryPrivate* context_factory_private = nullptr; 35 ui::ContextFactoryPrivate* context_factory_private = nullptr;
38 base::SequencedWorkerPool* blocking_pool = nullptr; 36 base::SequencedWorkerPool* blocking_pool = nullptr;
39 }; 37 };
40 38
41 } // namespace ash 39 } // namespace ash
42 40
43 #endif // ASH_SHELL_INIT_PARAMS_H_ 41 #endif // ASH_SHELL_INIT_PARAMS_H_
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698