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

Side by Side 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, 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ 5 #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
6 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ 6 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/singleton.h"
9 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
10 #include "ui/views/view.h" 11 #include "ui/views/view.h"
11 #include "ui/views/widget/widget_delegate.h" 12 #include "ui/views/widget/widget_delegate.h"
12 13
13 namespace ash { 14 namespace ash {
15
flackr 2012/03/05 16:16:03 nit: no newline here.
bshe 2012/03/06 01:33:27 Done.
14 namespace internal { 16 namespace internal {
15 17
16 class DesktopBackgroundView : public views::WidgetDelegateView { 18 class DesktopBackgroundView : public views::WidgetDelegateView {
17 public: 19 public:
18 DesktopBackgroundView(); 20 DesktopBackgroundView();
19 virtual ~DesktopBackgroundView(); 21 virtual ~DesktopBackgroundView();
22 void SetWallpaper(const SkBitmap& wallpaper);
23 static DesktopBackgroundView* GetInstance();
20 24
21 private: 25 private:
26 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
27
22 // Overridden from views::View: 28 // Overridden from views::View:
23 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 29 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
24 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 30 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
25 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; 31 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
26 32
27 SkBitmap wallpaper_; 33 SkBitmap wallpaper_;
28 34
29 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView); 35 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView);
30 }; 36 };
31 37
32 } // namespace internal 38 } // namespace internal
33 } // namespace ash 39 } // namespace ash
34 40
35 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ 41 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698