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

Side by Side Diff: ui/message_center/message_center_tray_unittest.cc

Issue 657923005: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/message_center/message_center_tray.h" 5 #include "ui/message_center/message_center_tray.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/base/models/menu_model.h" 9 #include "ui/base/models/menu_model.h"
10 #include "ui/message_center/message_center.h" 10 #include "ui/message_center/message_center.h"
(...skipping 28 matching lines...) Expand all
39 39
40 private: 40 private:
41 DISALLOW_COPY_AND_ASSIGN(MockDelegate); 41 DISALLOW_COPY_AND_ASSIGN(MockDelegate);
42 }; 42 };
43 43
44 } // namespace 44 } // namespace
45 45
46 class MessageCenterTrayTest : public testing::Test { 46 class MessageCenterTrayTest : public testing::Test {
47 public: 47 public:
48 MessageCenterTrayTest() {} 48 MessageCenterTrayTest() {}
49 virtual ~MessageCenterTrayTest() {} 49 ~MessageCenterTrayTest() override {}
50 50
51 virtual void SetUp() { 51 void SetUp() override {
52 MessageCenter::Initialize(); 52 MessageCenter::Initialize();
53 delegate_.reset(new MockDelegate); 53 delegate_.reset(new MockDelegate);
54 message_center_ = MessageCenter::Get(); 54 message_center_ = MessageCenter::Get();
55 message_center_tray_.reset( 55 message_center_tray_.reset(
56 new MessageCenterTray(delegate_.get(), message_center_)); 56 new MessageCenterTray(delegate_.get(), message_center_));
57 } 57 }
58 58
59 virtual void TearDown() { 59 void TearDown() override {
60 message_center_tray_.reset(); 60 message_center_tray_.reset();
61 delegate_.reset(); 61 delegate_.reset();
62 message_center_ = NULL; 62 message_center_ = NULL;
63 MessageCenter::Shutdown(); 63 MessageCenter::Shutdown();
64 } 64 }
65 65
66 protected: 66 protected:
67 NotifierId DummyNotifierId() { 67 NotifierId DummyNotifierId() {
68 return NotifierId(); 68 return NotifierId();
69 } 69 }
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 model = message_center_tray_->CreateNotificationMenuModel( 293 model = message_center_tray_->CreateNotificationMenuModel(
294 notifier_id2, base::string16()); 294 notifier_id2, base::string16());
295 EXPECT_EQ(1, model->GetItemCount()); 295 EXPECT_EQ(1, model->GetItemCount());
296 EXPECT_EQ(second_command, model->GetCommandIdAt(0)); 296 EXPECT_EQ(second_command, model->GetCommandIdAt(0));
297 297
298 // The command itself is disabled because delegate disables context menu. 298 // The command itself is disabled because delegate disables context menu.
299 EXPECT_FALSE(model->IsEnabledAt(0)); 299 EXPECT_FALSE(model->IsEnabledAt(0));
300 } 300 }
301 301
302 } // namespace message_center 302 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/message_center_impl_unittest.cc ('k') | ui/message_center/notification_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698