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

Side by Side Diff: ash/shell_factory.h

Issue 11878013: Make ui_controls only usable from interactive_ui_tests. This has two benefits: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/shell.cc ('k') | ash/ui_controls_ash.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_FACTORY_H_ 5 #ifndef ASH_SHELL_FACTORY_H_
6 #define ASH_SHELL_FACTORY_H_ 6 #define ASH_SHELL_FACTORY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 9
10 namespace aura { 10 namespace aura {
11 class RootWindow; 11 class RootWindow;
12 } 12 }
13 13
14 namespace gfx { 14 namespace gfx {
15 class ImageSkia; 15 class ImageSkia;
16 } 16 }
17 17
18 namespace ui_controls {
19 class UIControlsAura;
20 }
21
22 namespace views { 18 namespace views {
23 class View; 19 class View;
24 class Widget; 20 class Widget;
25 } 21 }
26 22
27 // Declarations of shell component factory functions. 23 // Declarations of shell component factory functions.
28 24
29 namespace ash { 25 namespace ash {
30 26
31 namespace internal { 27 namespace internal {
32 views::Widget* CreateDesktopBackground(aura::RootWindow* root_window, 28 views::Widget* CreateDesktopBackground(aura::RootWindow* root_window,
33 int container_id); 29 int container_id);
34 30
35 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents); 31 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
36
37 ui_controls::UIControlsAura* CreateUIControls();
38 } // namespace internal 32 } // namespace internal
39 33
40 } // namespace ash 34 } // namespace ash
41 35
42 36
43 #endif // ASH_SHELL_FACTORY_H_ 37 #endif // ASH_SHELL_FACTORY_H_
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/ui_controls_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698