Suppressed screen rotation notifications triggeres by the accelerometer

ash/wm/maximize_mode/maximize_mode_controller.cc

 // Copyright 2014 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.
 
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 
 #include "ash/accelerometer/accelerometer_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_event_blocker.h"
 #include "ui/gfx/vector3d_f.h"
+#include "ui/message_center/message_center.h"
+#include "ui/message_center/notification_blocker.h"
 
 namespace ash {
 
 namespace {
 
 // The hinge angle at which to enter maximize mode.
 const float kEnterMaximizeModeAngle = 200.0f;
 
 // The angle at which to exit maximize mode, this is specifically less than the
 // angle to enter maximize mode to prevent rapid toggling when near the angle.
@@ skipping 27 matching lines @@
 // rotate to match it (i.e. 45.0f is no stickiness).
 const float kDisplayRotationStickyAngleDegrees = 60.0f;
 
 // The minimum acceleration in a direction required to trigger screen rotation.
 // This prevents rapid toggling of rotation when the device is near flat and
 // there is very little screen aligned force on it.
 const float kMinimumAccelerationScreenRotation = 0.3f;
 
 const float kRadiansToDegrees = 180.0f / 3.14159265f;
 
+// A message centre notification blocker used to suppress screen rotation

[flackr, 2014/05/05 20:26:54]

nit: s/centre/center

[bruthig, 2014/05/05 20:57:22]

Done.

+// events caused by accelerometer events
+class ScopedNotificationBlocker
+    : public message_center::NotificationBlocker {
+ public:
+  ScopedNotificationBlocker();
+

[flackr, 2014/05/05 20:26:54]

nit: no newline needed between constructor and destructor.

[bruthig, 2014/05/05 20:57:22]

Done.

+  virtual ~ScopedNotificationBlocker();
+
+ private:
+  // Overriden from message_center::NotificationBlocker.
+  virtual bool ShouldShowNotificationAsPopup(
+      const message_center::NotifierId& notifier_id) const OVERRIDE;
+
+// Overriden from message_center::NotificationBlocker.
+  virtual bool ShouldShowNotification(
+      const message_center::NotifierId& notifier_id) const OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedNotificationBlocker);
+};
+
+ScopedNotificationBlocker::ScopedNotificationBlocker()
+    : message_center::NotificationBlocker(
+      message_center::MessageCenter::Get()) {

[flackr, 2014/05/05 20:26:54]

nit: indent 4 more to show it's part of the previous line's constructor call.

[bruthig, 2014/05/05 20:57:22]

Done.

+  NotifyBlockingStateChanged();
+}
+
+ScopedNotificationBlocker::~ScopedNotificationBlocker() {
+}
+
+bool ScopedNotificationBlocker::ShouldShowNotificationAsPopup(
+    const message_center::NotifierId& notifier_id) const {
+  return false;
+}
+
+bool ScopedNotificationBlocker::ShouldShowNotification(
+    const message_center::NotifierId& notifier_id) const {
+  return false;
+}
+
 // Returns the angle between |base| and |other| in degrees.
 float AngleBetweenVectorsInDegrees(const gfx::Vector3dF& base,
                                  const gfx::Vector3dF& other) {
   return acos(gfx::DotProduct(base, other) /
               base.Length() / other.Length()) * kRadiansToDegrees;
 }
 
 // Returns the clockwise angle between |base| and |other| where |normal| is the
 // normal of the virtual surface to measure clockwise according to.
 float ClockwiseAngleBetweenVectorsInDegrees(const gfx::Vector3dF& base,
@@ skipping 93 matching lines @@
   // If maximize mode is not engaged, ensure the screen is not rotated and
   // do not rotate to match the current device orientation.
   if (!maximize_mode_engaged) {
     if (current_rotation != gfx::Display::ROTATE_0) {
       // TODO(flackr): Currently this will prevent setting a manual rotation on
       // the screen of a device with an accelerometer, this should only set it
       // back to ROTATE_0 if it was last set by the accelerometer.
       // Also, SetDisplayRotation will save the setting to the local store,
       // this should be stored in a way that we can distinguish what the
       // rotation was set by.
-      display_manager->SetDisplayRotation(gfx::Display::InternalDisplayId(),
-                                          gfx::Display::ROTATE_0);
+      SetDisplayRotation(display_manager,
+                         gfx::Display::InternalDisplayId(),
+                         gfx::Display::ROTATE_0);
     }
     rotation_locked_ = false;
     return;
   }
 
   if (rotation_locked_)
     return;
 
   // After determining maximize mode state, determine if the screen should
   // be rotated.
@@ skipping 37 matching lines @@
     new_rotation = gfx::Display::ROTATE_0;
   else if (angle < 180.0f)
     new_rotation = gfx::Display::ROTATE_270;
   else if (angle < 270.0f)
     new_rotation = gfx::Display::ROTATE_180;
 
   // When exiting maximize mode return rotation to 0. When entering, rotate to
   // match screen orientation.
   if (new_rotation == gfx::Display::ROTATE_0 ||
       maximize_mode_engaged) {
-    display_manager->SetDisplayRotation(gfx::Display::InternalDisplayId(),
-                                        new_rotation);
+    SetDisplayRotation(display_manager,
+                       gfx::Display::InternalDisplayId(),
+                       new_rotation);
   }
 }
 
+void MaximizeModeController::SetDisplayRotation(
+    DisplayManager* display_manager,
+    int64 display_id,
+    gfx::Display::Rotation rotation) const {
+  // Suppress message centre notifications for screen rotations caused
+  // by accelerometer events because it should be obvious why the orientation
+  // changed.
+  ScopedNotificationBlocker notification_blocker;
+  display_manager->SetDisplayRotation(display_id, rotation);
+}
+
 }  // namespace ash