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

Side by Side Diff: ash/shell_factory.h

Issue 10810039: 2nd display should show the same background as login/lock screen: (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Post-review fix #2 Created 8 years, 4 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
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 #include "ash/desktop_background/desktop_background_resources.h" 9 #include "ash/desktop_background/desktop_background_resources.h"
10 10
(...skipping 12 matching lines...) Expand all
23 namespace views { 23 namespace views {
24 class View; 24 class View;
25 class Widget; 25 class Widget;
26 } 26 }
27 27
28 // Declarations of shell component factory functions. 28 // Declarations of shell component factory functions.
29 29
30 namespace ash { 30 namespace ash {
31 31
32 namespace internal { 32 namespace internal {
33 void CreateDesktopBackground(aura::RootWindow* root_window); 33 views::Widget* CreateDesktopBackground(aura::RootWindow* root_window,
34 int container_id);
34 35
35 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents); 36 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
36 37
37 ui_controls::UIControlsAura* CreateUIControls(); 38 ui_controls::UIControlsAura* CreateUIControls();
38 } // namespace internal 39 } // namespace internal
39 40
40 } // namespace ash 41 } // namespace ash
41 42
42 43
43 #endif // ASH_SHELL_FACTORY_H_ 44 #endif // ASH_SHELL_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698