Index: ash/display/resolution_notification_controller.h |
diff --git a/ash/display/resolution_notification_controller.h b/ash/display/resolution_notification_controller.h |
new file mode 100644 |
index 0000000000000000000000000000000000000000..23d47e1429f82bc88f47e759966b88daeb00d559 |
--- /dev/null |
+++ b/ash/display/resolution_notification_controller.h |
@@ -0,0 +1,119 @@ |
+// Copyright 2013 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+#ifndef ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_ |
+#define ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_ |
+ |
+#include "ash/ash_export.h" |
+#include "ash/display/display_controller.h" |
+#include "base/callback.h" |
+#include "base/gtest_prod_util.h" |
+#include "base/timer/timer.h" |
+#include "ui/gfx/display_observer.h" |
+#include "ui/gfx/size.h" |
+ |
+namespace views { |
+class Label; |
+class Widget; |
+} // namespace views |
+ |
+namespace ash { |
+namespace internal { |
+// A class which manages the notification of display resolution change and |
+// also manages the timeout in case the new resolution is unusable. |
+class ASH_EXPORT ResolutionNotificationController |
+ : public gfx::DisplayObserver, |
+ public DisplayController::Observer { |
+ public: |
+ ResolutionNotificationController(); |
+ virtual ~ResolutionNotificationController(); |
+ |
+ // Updates the display resolution for |display_id| to |new_resolution| and |
+ // creates a notification for this change which offers a button to revert the |
+ // change in case something goes wrong. The notification times out if there's |
+ // only one display connected and the user is trying to modify its resolution. |
+ // In that case, the timeout has to be set since the user cannot make any |
+ // changes if something goes wrong. |
+ void SetDisplayResolutionAndNotify( |
+ int64 display_id, |
+ const gfx::Size& old_resolution, |
+ const gfx::Size& new_resolution, |
+ const base::Closure& accept_callback); |
+ |
+ // Returns true if the notification is visible or scheduled to be visible and |
+ // the notification times out. |
+ bool DoesNotificationTimeout(); |
+ |
+ // Called by the notification delegate when the user accepts the display |
+ // resolution change. |
+ void AcceptResolutionChange(); |
+ |
+ // Called by the notification delegate when the user wants to revert the |
+ // display resolution change. |
+ void RevertResolutionChange(); |
+ |
+ private: |
+ friend class ResolutionNotificationControllerTest; |
+ FRIEND_TEST_ALL_PREFIXES(ResolutionNotificationControllerTest, Timeout); |
+ |
+ // A struct to bundle the data for a single resolution change. |
+ struct ResolutionChangeInfo { |
oshima
2013/08/09 17:42:56
can you move the definition to .cc because this is
Jun Mukai
2013/08/09 21:04:58
Done.
|
+ ResolutionChangeInfo(int64 display_id, |
+ const gfx::Size& old_resolution, |
+ const gfx::Size& new_resolution, |
+ const base::Closure& accept_callback); |
+ ~ResolutionChangeInfo(); |
+ |
+ // The id of the display where the resolution change happens. |
+ int64 display_id; |
+ |
+ // The resolution before the change. |
+ gfx::Size old_resolution; |
+ |
+ // The new resolution after the change. |
+ gfx::Size new_resolution; |
+ |
+ // The callback when accept is chosen. |
+ base::Closure accept_callback; |
+ |
+ // The remaining timeout in seconds. 0 if the change does not time out. |
+ uint8 timeout_count; |
+ |
+ // The timer to invoke OnTimerTick() every second. This cannot be |
+ // OneShotTimer since the message contains text "automatically closed in xx |
+ // seconds..." which has to be updated every second. |
+ base::RepeatingTimer<ResolutionNotificationController> timer; |
+ |
+ private: |
+ DISALLOW_COPY_AND_ASSIGN(ResolutionChangeInfo); |
+ }; |
+ |
+ static const int kTimeoutInSec; |
+ static const char kNotificationId[]; |
+ |
+ // Create a new notification, or update its content if it already exists. |
+ void CreateOrUpdateNotification(); |
+ |
+ // Called every second for timeout. |
+ void OnTimerTick(); |
+ |
+ // gfx::DisplayObserver overrides: |
+ virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; |
+ virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; |
+ virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; |
+ |
+ // DisplayController::Observer overrides: |
+ virtual void OnDisplayConfigurationChanged() OVERRIDE; |
+ |
+ static void SuppressTimerForTest(); |
+ |
+ scoped_ptr<ResolutionChangeInfo> change_info_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(ResolutionNotificationController); |
+}; |
+ |
+} // namespace internal |
+} // namespace ash |
+ |
+#endif // ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_ |