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

Unified Diff: ash/desktop_background/desktop_background_view.h

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: More refactor Created 8 years, 10 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
Index: ash/desktop_background/desktop_background_view.h
diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h
index 6af658325a6423f13ad9e61ed3b0852a91ba986c..ec67634b62d4410b5790dad292d7b524f667b5cc 100644
--- a/ash/desktop_background/desktop_background_view.h
+++ b/ash/desktop_background/desktop_background_view.h
@@ -6,19 +6,25 @@
#define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
#pragma once
+#include "base/memory/singleton.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget_delegate.h"
namespace ash {
+
flackr 2012/03/05 16:16:03 nit: no newline here.
bshe 2012/03/06 01:33:27 Done.
namespace internal {
class DesktopBackgroundView : public views::WidgetDelegateView {
public:
DesktopBackgroundView();
virtual ~DesktopBackgroundView();
+ void SetWallpaper(const SkBitmap& wallpaper);
+ static DesktopBackgroundView* GetInstance();
private:
+ friend struct DefaultSingletonTraits<DesktopBackgroundView>;
flackr 2012/03/05 16:16:03 I worry about the implications of making this clas
bshe 2012/03/06 01:33:27 I created a new function called SetDesktopBackgrou
+
// Overridden from views::View:
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698