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

Unified Diff: chrome/browser/status_icons/status_icon_menu_model_unittest.cc

Issue 1420163003: Fixed Windows system tray icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@profile-icon-imagefamily
Patch Set: Revert changes to start in a delayed task. Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/status_icons/status_icon_menu_model_unittest.cc
diff --git a/chrome/browser/status_icons/status_icon_menu_model_unittest.cc b/chrome/browser/status_icons/status_icon_menu_model_unittest.cc
index 4c2a2b0b09b546d31c5e6f76cf4170acad374da8..19b9c75779117bbedd0517a357e1e35d1524aadb 100644
--- a/chrome/browser/status_icons/status_icon_menu_model_unittest.cc
+++ b/chrome/browser/status_icons/status_icon_menu_model_unittest.cc
@@ -9,11 +9,10 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/status_icons/status_icon.h"
#include "chrome/browser/status_icons/status_tray.h"
-#include "grit/chrome_unscaled_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/accelerators/accelerator.h"
-#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_unittest_util.h"
using base::ASCIIToUTF16;
@@ -70,8 +69,7 @@ TEST_F(StatusIconMenuModelTest, SetProperties) {
menu_model()->AddItem(1, ASCIIToUTF16("foo2"));
ui::Accelerator test_accel(ui::VKEY_A, ui::EF_NONE);
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- gfx::Image test_image1(*rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON));
+ gfx::Image test_image1 = gfx::test::CreateImage(16, 16);
ui::Accelerator accel_arg;
gfx::Image image_arg;
« no previous file with comments | « chrome/browser/background/background_mode_manager.cc ('k') | chrome/browser/status_icons/status_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698