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

Unified Diff: ash/root_window_controller.h

Issue 18163006: Add persisted preference for projection touch HUD (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolved clang compile errors + Resolved linux_chromeos trybot failure Created 7 years, 5 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 | « no previous file | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 393dcb312022ee9174ad7ff9af0c3d540b91fd52..920c553c28fcae8f89f49bf8c6fb7c57863a012a 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -9,6 +9,7 @@
#include "ash/ash_export.h"
#include "ash/shelf/shelf_types.h"
+#include "ash/shell_observer.h"
#include "ash/system/user/login_status.h"
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
@@ -68,10 +69,10 @@ class WorkspaceController;
// deleted upon the deletion of the root window. The RootWindowController
// for particular root window is stored as a property and can be obtained
// using |GetRootWindowController(aura::RootWindow*)| function.
-class ASH_EXPORT RootWindowController {
+class ASH_EXPORT RootWindowController : public ShellObserver {
public:
explicit RootWindowController(aura::RootWindow* root_window);
- ~RootWindowController();
+ virtual ~RootWindowController();
// Returns a RootWindowController that has a launcher for given
// |window|. This returns the RootWindowController for the |window|'s
@@ -122,12 +123,6 @@ class ASH_EXPORT RootWindowController {
touch_hud_projection_ = hud;
}
- // Enables projection touch HUD.
- void EnableTouchHudProjection();
-
- // Disables projection touch HUD.
- void DisableTouchHudProjection();
-
DesktopBackgroundWidgetController* wallpaper_controller() {
return wallpaper_controller_.get();
}
@@ -173,9 +168,6 @@ class ASH_EXPORT RootWindowController {
// Called when the launcher associated with this root window is created.
void OnLauncherCreated();
- // Called when the user logs in.
- void OnLoginStateChanged(user::LoginStatus status);
-
// Called when the login status changes after login (such as lock/unlock).
// TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
void UpdateAfterLoginStatusChange(user::LoginStatus status);
@@ -228,6 +220,16 @@ class ASH_EXPORT RootWindowController {
// Initializes the virtual keyboard.
void InitKeyboard();
+ // Enables projection touch HUD.
+ void EnableTouchHudProjection();
+
+ // Disables projection touch HUD.
+ void DisableTouchHudProjection();
+
+ // Overridden from ShellObserver.
+ virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE;
+ virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE;
+
scoped_ptr<aura::RootWindow> root_window_;
RootWindowLayoutManager* root_window_layout_;
« no previous file with comments | « no previous file | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698