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-23 13:46:07 +0000
committerbshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-23 13:46:07 +0000
commitff6c38d6dc90b0bafe92b24f5f4657ff535f813e (patch)
tree82b06afc5d7d7a109a611b9fbb1cf751ad73f824 /ash/shell_factory.h
parentf2a6af064c6be8ab69f2fed83d88b875a5c84a48 (diff)
downloadchromium_src-ff6c38d6dc90b0bafe92b24f5f4657ff535f813e.zip
chromium_src-ff6c38d6dc90b0bafe92b24f5f4657ff535f813e.tar.gz
chromium_src-ff6c38d6dc90b0bafe92b24f5f4657ff535f813e.tar.bz2
Add image layout parameter for wallpaper
+emmanuel's patch: add some new resources and paint background with specified layout. BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/9808045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128474 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 b90889b..1e57953 100644
--- a/ash/shell_factory.h
+++ b/ash/shell_factory.h
@@ -7,6 +7,7 @@
#pragma once
#include "ash/ash_export.h"
+#include "ash/desktop_background/desktop_background_resources.h"
class SkBitmap;
@@ -20,7 +21,8 @@ class Widget;
namespace ash {
namespace internal {
-views::Widget* CreateDesktopBackground(const SkBitmap& wallpaper);
+views::Widget* CreateDesktopBackground(const SkBitmap& wallpaper,
+ ImageLayout layout);
ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
} // namespace internal