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

Side by Side Diff: chrome/browser/status_icons/status_tray_unittest.cc

Issue 648653003: Standardize usage of virtual/override/final in chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 (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 "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/strings/string_util.h" 6 #include "base/strings/string_util.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/status_icons/status_icon.h" 8 #include "chrome/browser/status_icons/status_icon.h"
9 #include "chrome/browser/status_icons/status_tray.h" 9 #include "chrome/browser/status_icons/status_tray.h"
10 #include "grit/chrome_unscaled_resources.h" 10 #include "grit/chrome_unscaled_resources.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/gfx/image/image_skia.h" 13 #include "ui/gfx/image/image_skia.h"
14 14
15 class MockStatusIcon : public StatusIcon { 15 class MockStatusIcon : public StatusIcon {
16 virtual void SetImage(const gfx::ImageSkia& image) override {} 16 void SetImage(const gfx::ImageSkia& image) override {}
17 virtual void SetToolTip(const base::string16& tool_tip) override {} 17 void SetToolTip(const base::string16& tool_tip) override {}
18 virtual void DisplayBalloon(const gfx::ImageSkia& icon, 18 void DisplayBalloon(const gfx::ImageSkia& icon,
19 const base::string16& title, 19 const base::string16& title,
20 const base::string16& contents) override {} 20 const base::string16& contents) override {}
21 virtual void UpdatePlatformContextMenu( 21 void UpdatePlatformContextMenu(StatusIconMenuModel* menu) override {}
22 StatusIconMenuModel* menu) override {}
23 }; 22 };
24 23
25 class TestStatusTray : public StatusTray { 24 class TestStatusTray : public StatusTray {
26 public: 25 public:
27 virtual StatusIcon* CreatePlatformStatusIcon( 26 StatusIcon* CreatePlatformStatusIcon(
28 StatusIconType type, 27 StatusIconType type,
29 const gfx::ImageSkia& image, 28 const gfx::ImageSkia& image,
30 const base::string16& tool_tip) override { 29 const base::string16& tool_tip) override {
31 return new MockStatusIcon(); 30 return new MockStatusIcon();
32 } 31 }
33 32
34 const StatusIcons& GetStatusIconsForTest() const { return status_icons(); } 33 const StatusIcons& GetStatusIconsForTest() const { return status_icons(); }
35 }; 34 };
36 35
37 TEST(StatusTrayTest, Create) { 36 TEST(StatusTrayTest, Create) {
(...skipping 10 matching lines...) Expand all
48 TEST(StatusTrayTest, CreateRemove) { 47 TEST(StatusTrayTest, CreateRemove) {
49 TestStatusTray tray; 48 TestStatusTray tray;
50 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 49 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
51 gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON); 50 gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
52 StatusIcon* icon = tray.CreateStatusIcon( 51 StatusIcon* icon = tray.CreateStatusIcon(
53 StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")); 52 StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip"));
54 EXPECT_EQ(1U, tray.GetStatusIconsForTest().size()); 53 EXPECT_EQ(1U, tray.GetStatusIconsForTest().size());
55 tray.RemoveStatusIcon(icon); 54 tray.RemoveStatusIcon(icon);
56 EXPECT_EQ(0U, tray.GetStatusIconsForTest().size()); 55 EXPECT_EQ(0U, tray.GetStatusIconsForTest().size());
57 } 56 }
OLDNEW
« no previous file with comments | « chrome/browser/status_icons/status_icon_unittest.cc ('k') | chrome/browser/tab_contents/background_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698