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

Side by Side Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 1645843003: Implement Non-Closable Notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary property. Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/content/display/screen_orientation_controller_chromeos_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/accelerators/accelerator_controller.h" 5 #include "ash/accelerators/accelerator_controller.h"
6 6
7 #include "ash/accelerators/accelerator_table.h" 7 #include "ash/accelerators/accelerator_table.h"
8 #include "ash/accessibility_delegate.h" 8 #include "ash/accessibility_delegate.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 1501 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 1512
1513 bool ContainsDeprecatedAcceleratorNotification(const char* const id) const { 1513 bool ContainsDeprecatedAcceleratorNotification(const char* const id) const {
1514 return nullptr != message_center()->FindVisibleNotificationById(id); 1514 return nullptr != message_center()->FindVisibleNotificationById(id);
1515 } 1515 }
1516 1516
1517 bool IsMessageCenterEmpty() const { 1517 bool IsMessageCenterEmpty() const {
1518 return message_center()->GetVisibleNotifications().empty(); 1518 return message_center()->GetVisibleNotifications().empty();
1519 } 1519 }
1520 1520
1521 void RemoveAllNotifications() const { 1521 void RemoveAllNotifications() const {
1522 message_center()->RemoveAllNotifications(false); 1522 message_center()->RemoveAllNotifications(
1523 false /* by_user */, message_center::MessageCenter::RemoveType::ALL);
1523 } 1524 }
1524 1525
1525 message_center::MessageCenter* message_center() const { 1526 message_center::MessageCenter* message_center() const {
1526 return message_center::MessageCenter::Get(); 1527 return message_center::MessageCenter::Get();
1527 } 1528 }
1528 1529
1529 private: 1530 private:
1530 DISALLOW_COPY_AND_ASSIGN(DeprecatedAcceleratorTester); 1531 DISALLOW_COPY_AND_ASSIGN(DeprecatedAcceleratorTester);
1531 }; 1532 };
1532 1533
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1575 EXPECT_TRUE(IsMessageCenterEmpty()); 1576 EXPECT_TRUE(IsMessageCenterEmpty());
1576 1577
1577 // If the action is LOCK_SCREEN, we must reset the state by unlocking the 1578 // If the action is LOCK_SCREEN, we must reset the state by unlocking the
1578 // screen before we proceed testing the rest of accelerators. 1579 // screen before we proceed testing the rest of accelerators.
1579 ResetStateIfNeeded(); 1580 ResetStateIfNeeded();
1580 } 1581 }
1581 } 1582 }
1582 #endif // defined(OS_CHROMEOS) 1583 #endif // defined(OS_CHROMEOS)
1583 1584
1584 } // namespace ash 1585 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/content/display/screen_orientation_controller_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698