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

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

Issue 464163003: Remove IDR_STATUS_TRAY_ICON_PRESSED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed from gtk2_status_icon and UT files Created 6 years, 3 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 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE {}
17 virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE {}
18 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE {} 17 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE {}
19 virtual void DisplayBalloon(const gfx::ImageSkia& icon, 18 virtual void DisplayBalloon(const gfx::ImageSkia& icon,
20 const base::string16& title, 19 const base::string16& title,
21 const base::string16& contents) OVERRIDE {} 20 const base::string16& contents) OVERRIDE {}
22 virtual void UpdatePlatformContextMenu( 21 virtual void UpdatePlatformContextMenu(
23 StatusIconMenuModel* menu) OVERRIDE {} 22 StatusIconMenuModel* menu) OVERRIDE {}
24 }; 23 };
25 24
26 class TestStatusTray : public StatusTray { 25 class TestStatusTray : public StatusTray {
27 public: 26 public:
(...skipping 21 matching lines...) Expand all
49 TEST(StatusTrayTest, CreateRemove) { 48 TEST(StatusTrayTest, CreateRemove) {
50 TestStatusTray tray; 49 TestStatusTray tray;
51 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 50 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
52 gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON); 51 gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
53 StatusIcon* icon = tray.CreateStatusIcon( 52 StatusIcon* icon = tray.CreateStatusIcon(
54 StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")); 53 StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip"));
55 EXPECT_EQ(1U, tray.GetStatusIconsForTest().size()); 54 EXPECT_EQ(1U, tray.GetStatusIconsForTest().size());
56 tray.RemoveStatusIcon(icon); 55 tray.RemoveStatusIcon(icon);
57 EXPECT_EQ(0U, tray.GetStatusIconsForTest().size()); 56 EXPECT_EQ(0U, tray.GetStatusIconsForTest().size());
58 } 57 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698