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

Side by Side Diff: ash/shell_init_params.h

Issue 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tooltip on chromeos Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/shell/window_watcher_unittest.cc ('k') | ash/shell_init_params.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 "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
11 #include <windows.h> 11 #include <windows.h>
12 #endif 12 #endif
13 13
14 #include "ash/ash_export.h" 14 #include "ash/ash_export.h"
15 15
16 namespace ui {
17 class ContextFactory;
18 }
19
16 namespace ash { 20 namespace ash {
17 21
18 class ShellDelegate; 22 class ShellDelegate;
19 23
20 struct ASH_EXPORT ShellInitParams { 24 struct ASH_EXPORT ShellInitParams {
21 ShellInitParams(); 25 ShellInitParams();
22 ~ShellInitParams(); 26 ~ShellInitParams();
23 27
24 ShellDelegate* delegate; 28 ShellDelegate* delegate;
25 29
30 ui::ContextFactory* context_factory;
31
26 #if defined(OS_WIN) 32 #if defined(OS_WIN)
27 HWND remote_hwnd; 33 HWND remote_hwnd;
28 #endif 34 #endif
29 }; 35 };
30 36
31 } // namespace ash 37 } // namespace ash
32 38
33 #endif // ASH_SHELL_INIT_PARAMS_H_ 39 #endif // ASH_SHELL_INIT_PARAMS_H_
OLDNEW
« no previous file with comments | « ash/shell/window_watcher_unittest.cc ('k') | ash/shell_init_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698