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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_factory.h
diff --git a/ash/shell_factory.h b/ash/shell_factory.h
index 0faec35ae09b25f0adc06670a686e6b13d509aec..b90889bcf185c67b4586a1adb1fb795dfe9e9c80 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
« 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