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

Side by Side Diff: ui/message_center/views/notification_view_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/views/notification_view.h" 5 #include "ui/message_center/views/notification_view.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
(...skipping 10 matching lines...) Expand all
21 namespace message_center { 21 namespace message_center {
22 22
23 /* Test fixture ***************************************************************/ 23 /* Test fixture ***************************************************************/
24 24
25 class NotificationViewTest : public views::ViewsTestBase, 25 class NotificationViewTest : public views::ViewsTestBase,
26 public MessageCenterController { 26 public MessageCenterController {
27 public: 27 public:
28 NotificationViewTest(); 28 NotificationViewTest();
29 virtual ~NotificationViewTest(); 29 virtual ~NotificationViewTest();
30 30
31 virtual void SetUp() OVERRIDE; 31 virtual void SetUp() override;
32 virtual void TearDown() OVERRIDE; 32 virtual void TearDown() override;
33 33
34 views::Widget* widget() { return notification_view_->GetWidget(); } 34 views::Widget* widget() { return notification_view_->GetWidget(); }
35 NotificationView* notification_view() { return notification_view_.get(); } 35 NotificationView* notification_view() { return notification_view_.get(); }
36 Notification* notification() { return notification_.get(); } 36 Notification* notification() { return notification_.get(); }
37 RichNotificationData* data() { return data_.get(); } 37 RichNotificationData* data() { return data_.get(); }
38 38
39 // Overridden from MessageCenterController: 39 // Overridden from MessageCenterController:
40 virtual void ClickOnNotification(const std::string& notification_id) OVERRIDE; 40 virtual void ClickOnNotification(const std::string& notification_id) override;
41 virtual void RemoveNotification(const std::string& notification_id, 41 virtual void RemoveNotification(const std::string& notification_id,
42 bool by_user) OVERRIDE; 42 bool by_user) override;
43 virtual scoped_ptr<ui::MenuModel> CreateMenuModel( 43 virtual scoped_ptr<ui::MenuModel> CreateMenuModel(
44 const NotifierId& notifier_id, 44 const NotifierId& notifier_id,
45 const base::string16& display_source) OVERRIDE; 45 const base::string16& display_source) override;
46 virtual bool HasClickedListener(const std::string& notification_id) OVERRIDE; 46 virtual bool HasClickedListener(const std::string& notification_id) override;
47 virtual void ClickOnNotificationButton(const std::string& notification_id, 47 virtual void ClickOnNotificationButton(const std::string& notification_id,
48 int button_index) OVERRIDE; 48 int button_index) override;
49 49
50 protected: 50 protected:
51 const gfx::Image CreateTestImage(int width, int height) { 51 const gfx::Image CreateTestImage(int width, int height) {
52 return gfx::Image::CreateFrom1xBitmap(CreateBitmap(width, height)); 52 return gfx::Image::CreateFrom1xBitmap(CreateBitmap(width, height));
53 } 53 }
54 54
55 const SkBitmap CreateBitmap(int width, int height) { 55 const SkBitmap CreateBitmap(int width, int height) {
56 SkBitmap bitmap; 56 SkBitmap bitmap;
57 bitmap.allocN32Pixels(width, height); 57 bitmap.allocN32Pixels(width, height);
58 bitmap.eraseRGB(0, 255, 0); 58 bitmap.eraseRGB(0, 255, 0);
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 323
324 // Double-check that vertical order is correct. 324 // Double-check that vertical order is correct.
325 CheckVerticalOrderInNotification(); 325 CheckVerticalOrderInNotification();
326 326
327 // Tests that views remain in that order even after an update. 327 // Tests that views remain in that order even after an update.
328 UpdateNotificationViews(); 328 UpdateNotificationViews();
329 CheckVerticalOrderInNotification(); 329 CheckVerticalOrderInNotification();
330 } 330 }
331 331
332 } // namespace message_center 332 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/views/notification_view.cc ('k') | ui/message_center/views/notifier_settings_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698