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

Unified Diff: trunk/src/ash/system/chromeos/tray_display.cc

Issue 290563003: Revert 270746 "Suppressed screen rotation notifications triggere..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | trunk/src/ash/wm/maximize_mode/maximize_mode_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/system/chromeos/tray_display.cc
===================================================================
--- trunk/src/ash/system/chromeos/tray_display.cc (revision 270792)
+++ trunk/src/ash/system/chromeos/tray_display.cc (working copy)
@@ -14,7 +14,6 @@
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_notification_view.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/bind.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -375,13 +374,6 @@
if (message.empty())
return;
- // Don't display notifications for accelerometer triggered screen rotations.
- // See http://crbug.com/364949
- if (Shell::GetInstance()->maximize_mode_controller()->
- in_set_screen_rotation()) {
- return;
- }
-
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
scoped_ptr<Notification> notification(new Notification(
message_center::NOTIFICATION_TYPE_SIMPLE,
@@ -396,8 +388,7 @@
message_center::RichNotificationData(),
new message_center::HandleNotificationClickedDelegate(
base::Bind(&OpenSettings))));
-
- message_center::MessageCenter::Get()->AddNotification(notification.Pass());
+ message_center::MessageCenter::Get()->AddNotification(notification.Pass());
}
views::View* TrayDisplay::CreateDefaultView(user::LoginStatus status) {
« no previous file with comments | « no previous file | trunk/src/ash/wm/maximize_mode/maximize_mode_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698