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

Unified Diff: ash/desktop_background/desktop_background_controller.h

Issue 10810039: 2nd display should show the same background as login/lock screen: (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add OVERRIDE Created 8 years, 4 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/ash.gyp ('k') | ash/desktop_background/desktop_background_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_controller.h
diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
index ceb3868fc27aa8e4b75d5e6bb8d07ed08da2aa9c..ec9fcab402e7ad63e84990968cbc212a5aac0c6b 100644
--- a/ash/desktop_background/desktop_background_controller.h
+++ b/ash/desktop_background/desktop_background_controller.h
@@ -13,6 +13,9 @@
#include "base/memory/weak_ptr.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_observer.h"
+#include "ui/compositor/layer.h"
#include "ui/gfx/image/image_skia.h"
namespace aura {
@@ -47,7 +50,7 @@ class UserWallpaperDelegate {
// Loads selected desktop wallpaper from file system asynchronously and updates
// background layer if loaded successfully.
-class ASH_EXPORT DesktopBackgroundController {
+class ASH_EXPORT DesktopBackgroundController : public aura::WindowObserver {
public:
enum BackgroundMode {
BACKGROUND_IMAGE,
@@ -99,25 +102,52 @@ class ASH_EXPORT DesktopBackgroundController {
// is SystemGestureEventFilterTest.ThreeFingerSwipe.
void CreateEmptyWallpaper();
+ // Move all desktop widgets to locked container.
+ void MoveDesktopToLockedContainer();
+
+ // Move all desktop widgets to unlocked container.
+ void MoveDesktopToUnlockedContainer();
+
+ // WindowObserver implementation.
+ virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
+
private:
// An operation to asynchronously loads wallpaper.
class WallpaperOperation;
struct WallpaperData;
- // Creates a new background widget using the current wallpapaer image and
- // use it as a background of the |root_window|. Deletes the old widget if any.
- void SetDesktopBackgroundImage(aura::RootWindow* root_window);
-
- // Update the background of all root windows using the current wallpaper image
- // in |current_wallpaper_|.
- void UpdateDesktopBackgroundImageMode();
+ // Creates view for all root windows, or notifies them to repaint if they
+ // already exist.
+ void SetDesktopBackgroundImageMode();
// Creates a new background widget and sets the background mode to image mode.
// Called after wallpaper loaded successfully.
void OnWallpaperLoadCompleted(scoped_refptr<WallpaperOperation> wo);
+ // Adds layer with solid |color| to container |container_id| in |root_window|.
+ ui::Layer* SetColorLayerForContainer(SkColor color,
+ aura::RootWindow* root_window,
+ int container_id);
+
+ // Creates and adds component for current mode (either Widget or Layer) to
+ // |root_window|.
+ void InstallComponent(aura::RootWindow* root_window);
+
+ // Creates and adds component for current mode (either Widget or Layer) to
+ // all root windows.
+ void InstallComponentForAllWindows();
+
+ // Moves all descktop components from one container to other across all root
+ // windows.
+ void ReparentBackgroundWidgets(int src_container, int dst_container);
+
+ // Returns id for background container for unlocked and locked states.
+ int GetBackgroundContainerId(bool locked);
+
// Can change at runtime.
+ bool locked_;
+
BackgroundMode desktop_background_mode_;
SkColor background_color_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/desktop_background/desktop_background_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698