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

Side by Side Diff: ash/shell_factory.h

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to trunk Created 8 years, 9 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') | chrome/app/generated_resources.grd » ('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 10
11 class SkBitmap;
12
11 namespace views { 13 namespace views {
12 class View; 14 class View;
13 class Widget; 15 class Widget;
14 } 16 }
15 17
16 // Declarations of shell component factory functions. 18 // Declarations of shell component factory functions.
17 19
18 namespace ash { 20 namespace ash {
19 21
20 namespace internal { 22 namespace internal {
21 views::Widget* CreateDesktopBackground(); 23 views::Widget* CreateDesktopBackground(const SkBitmap& wallpaper);
22 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents); 24 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
23 } // namespace internal 25 } // namespace internal
24 26
25 } // namespace ash 27 } // namespace ash
26 28
27 29
28 #endif // ASH_SHELL_FACTORY_H_ 30 #endif // ASH_SHELL_FACTORY_H_
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698