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

Unified Diff: ash/wm/power_button_controller.h

Issue 326813004: Added quick lock mechanism while in Touchview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed kAshEnablePowerQuickLock to kAshEnablePowerButtonQuickLock. Created 6 years, 3 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/wm/power_button_controller.h
diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h
index f1780146c773ccb41e003f4061c7049d2d3baf58..faa7e35f776c0a0770756c698f09dd7be598d2de 100644
--- a/ash/wm/power_button_controller.h
+++ b/ash/wm/power_button_controller.h
@@ -5,9 +5,12 @@
#ifndef ASH_WM_POWER_BUTTON_CONTROLLER_H_
#define ASH_WM_POWER_BUTTON_CONTROLLER_H_
+#include "ash/accelerators/accelerator_controller.h"
+#include "ash/accelerators/accelerator_table.h"
#include "ash/ash_export.h"
#include "ash/wm/session_state_animator.h"
#include "base/basictypes.h"
+#include "ui/base/accelerators/accelerator.h"
#if defined(OS_CHROMEOS)
#include "ui/display/chromeos/display_configurator.h"
@@ -30,13 +33,14 @@ class PowerButtonControllerTest;
class LockStateController;
-// Displays onscreen animations and locks or suspends the system in response to
-// the power button being pressed or released.
+// Handles power & lock button events which may result in the locking or
+// shutting down of the system as well as taking screen shots.
class ASH_EXPORT PowerButtonController
+ : ui::EventHandler
// TODO(derat): Remove these ifdefs after DisplayConfigurator becomes
// cross-platform.
#if defined(OS_CHROMEOS)
- : public ui::DisplayConfigurator::Observer
+ , public ui::DisplayConfigurator::Observer
#endif
{
public:
@@ -47,6 +51,10 @@ class ASH_EXPORT PowerButtonController
has_legacy_power_button_ = legacy;
}
+ void set_enable_quick_lock_for_test(bool enable_quick_lock) {
+ enable_quick_lock_ = enable_quick_lock;
+ }
+
// Called when the current screen brightness changes.
void OnScreenBrightnessChanged(double percent);
@@ -54,6 +62,9 @@ class ASH_EXPORT PowerButtonController
void OnPowerButtonEvent(bool down, const base::TimeTicks& timestamp);
void OnLockButtonEvent(bool down, const base::TimeTicks& timestamp);
+ // ui::EventHandler:
+ virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
+
#if defined(OS_CHROMEOS)
// Overriden from ui::DisplayConfigurator::Observer:
virtual void OnDisplayModeChanged(
@@ -67,6 +78,9 @@ class ASH_EXPORT PowerButtonController
bool power_button_down_;
bool lock_button_down_;
+ // True when the volume down button is being held down.
+ bool volume_down_pressed_;
+
// Has the screen brightness been reduced to 0%?
bool brightness_is_zero_;
@@ -79,7 +93,10 @@ class ASH_EXPORT PowerButtonController
// that misreports power button releases?
bool has_legacy_power_button_;
- LockStateController* controller_; // Not owned.
+ // Enables quick, non-cancellable locking of the screen when in maximize mode.
+ bool enable_quick_lock_;
flackr 2014/09/03 12:48:29 I think we should just query the commandline when
bruthig 2014/09/08 15:33:20 Rob and I discussed offline and decided to leave t
+
+ LockStateController* controller_; // Not owned.
DISALLOW_COPY_AND_ASSIGN(PowerButtonController);
};

Powered by Google App Engine
This is Rietveld 408576698