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

Unified Diff: ash/desktop_background/desktop_background_controller.h

Issue 230613004: Block keyboard and mouse input when maximize mode is activated by accelerometer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use event targeter to block keyboard and mouse events. Created 6 years, 8 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_controller.h
diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
index 505f7441792b86584a009f06becf2453195119f0..dbe19399c105e0030adc8b54feca54c79dc1974a 100644
--- a/ash/desktop_background/desktop_background_controller.h
+++ b/ash/desktop_background/desktop_background_controller.h
@@ -7,6 +7,7 @@
#include "ash/ash_export.h"
#include "ash/display/display_controller.h"
+#include "ash/shell_observer.h"
#include "base/basictypes.h"
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
@@ -69,7 +70,8 @@ class WallpaperResizer;
// Loads selected desktop wallpaper from file system asynchronously and updates
// background layer if loaded successfully.
class ASH_EXPORT DesktopBackgroundController
- : public DisplayController::Observer {
+ : public DisplayController::Observer,
+ public ShellObserver {
public:
enum BackgroundMode {
BACKGROUND_NONE,
@@ -97,9 +99,6 @@ class ASH_EXPORT DesktopBackgroundController
WallpaperLayout GetWallpaperLayout() const;
- // Initialize root window's background.
- void OnRootWindowAdded(aura::Window* root_window);
-
// Loads builtin wallpaper asynchronously and sets to current wallpaper
// after loaded. Returns true if the controller started loading the
// wallpaper and false otherwise (i.e. the appropriate wallpaper was
@@ -132,9 +131,12 @@ class ASH_EXPORT DesktopBackgroundController
// Returns true if the desktop moved.
bool MoveDesktopToUnlockedContainer();
- // Overrides DisplayController::Observer:
+ // DisplayController::Observer:
virtual void OnDisplayConfigurationChanged() OVERRIDE;
+ // ShellObserver:
+ virtual void OnRootWindowAdded(aura::Window* root_window) OVERRIDE;
+
private:
friend class DesktopBackgroundControllerTest;
FRIEND_TEST_ALL_PREFIXES(DesktopBackgroundControllerTest, GetMaxDisplaySize);

Powered by Google App Engine
This is Rietveld 408576698