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

Side by Side Diff: ash/desktop_background/desktop_background_view.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "third_party/skia/include/core/SkBitmap.h" 9 #include "third_party/skia/include/core/SkBitmap.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 #include "ui/views/widget/widget_delegate.h" 11 #include "ui/views/widget/widget_delegate.h"
12 12
13 namespace ash { 13 namespace ash {
14 namespace internal { 14 namespace internal {
15 15
16 class DesktopBackgroundView : public views::WidgetDelegateView { 16 class DesktopBackgroundView : public views::WidgetDelegateView {
17 public: 17 public:
18 DesktopBackgroundView(); 18 DesktopBackgroundView(const SkBitmap& wallpaper);
19 virtual ~DesktopBackgroundView(); 19 virtual ~DesktopBackgroundView();
20 20
21 // TODO(bshe): Remove this function once issue 117244 is fixed. It is
22 // currently used in DesktopBackgroundController::
23 // OnDesktopBackgroundChanged.
24 void SetWallpaper(const SkBitmap& wallpaper);
25
21 private: 26 private:
22 // Overridden from views::View: 27 // Overridden from views::View:
23 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 28 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
24 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 29 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
25 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; 30 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
26 31
27 SkBitmap wallpaper_; 32 SkBitmap wallpaper_;
28 33
29 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView); 34 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView);
30 }; 35 };
31 36
32 } // namespace internal 37 } // namespace internal
33 } // namespace ash 38 } // namespace ash
34 39
35 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ 40 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_resources.cc ('k') | ash/desktop_background/desktop_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698