summaryrefslogtreecommitdiffstats
path: root/ash/shell_factory.h
diff options
context:
space:
mode:
authorbshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 03:32:47 +0000
committerbshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 03:32:47 +0000
commit79f50181e4cb6be0722c7c204b95f83a334e3db8 (patch)
tree0ad6108ee9498fc2173e8e50f39e8490dc1c6091 /ash/shell_factory.h
parent012c52ee3753362e29dd49f38e3cfa816d144ae3 (diff)
downloadchromium_src-79f50181e4cb6be0722c7c204b95f83a334e3db8.zip
chromium_src-79f50181e4cb6be0722c7c204b95f83a334e3db8.tar.gz
chromium_src-79f50181e4cb6be0722c7c204b95f83a334e3db8.tar.bz2
Enable user change background image in settings page in Aura build.
Only support change between default background images currently. Need more refactor work on code. BUG=105508 TEST= Review URL: http://codereview.chromium.org/9580023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_factory.h')
-rw-r--r--ash/shell_factory.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/shell_factory.h b/ash/shell_factory.h
index 0faec35..b90889b 100644
--- a/ash/shell_factory.h
+++ b/ash/shell_factory.h
@@ -8,6 +8,8 @@
#include "ash/ash_export.h"
+class SkBitmap;
+
namespace views {
class View;
class Widget;
@@ -18,7 +20,7 @@ class Widget;
namespace ash {
namespace internal {
-views::Widget* CreateDesktopBackground();
+views::Widget* CreateDesktopBackground(const SkBitmap& wallpaper);
ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
} // namespace internal