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

Side by Side Diff: ash/shell_factory.h

Issue 10545058: Add UIControlsAsh that works with multiple root windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ash/desktop_background/desktop_background_resources.h" 10 #include "ash/desktop_background/desktop_background_resources.h"
11 11
12 namespace aura { 12 namespace aura {
13 class RootWindow; 13 class RootWindow;
14 } 14 }
15 15
16 namespace gfx { 16 namespace gfx {
17 class ImageSkia; 17 class ImageSkia;
18 } 18 }
19 19
20 namespace ui_controls {
21 class UIControlsAura;
22 }
23
20 namespace views { 24 namespace views {
21 class View; 25 class View;
22 class Widget; 26 class Widget;
23 } 27 }
24 28
29
sky 2012/06/07 22:18:05 nit: remove this line.
oshima 2012/06/08 00:24:10 Done.
25 // Declarations of shell component factory functions. 30 // Declarations of shell component factory functions.
26 31
27 namespace ash { 32 namespace ash {
28 33
29 namespace internal { 34 namespace internal {
30 void CreateDesktopBackground(const gfx::ImageSkia& wallpaper, 35 void CreateDesktopBackground(const gfx::ImageSkia& wallpaper,
31 WallpaperLayout wallpaper_layout, 36 WallpaperLayout wallpaper_layout,
32 aura::RootWindow* root_window); 37 aura::RootWindow* root_window);
38
33 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents); 39 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
40
41 ui_controls::UIControlsAura* CreateUIControls();
34 } // namespace internal 42 } // namespace internal
35 43
36 } // namespace ash 44 } // namespace ash
37 45
38 46
39 #endif // ASH_SHELL_FACTORY_H_ 47 #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