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

Unified Diff: chrome/browser/ui/toolbar/media_router_action_unittest.cc

Issue 2143863004: Use vector assets for media router icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: init to zero Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/toolbar/media_router_action.cc ('k') | ui/gfx/paint_vector_icon.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/media_router_action_unittest.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action_unittest.cc b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
index 1542cf386c87a9baf00fdb096173381f1de61e81..d09f0225681e175132a815f50659208f07e74950 100644
--- a/chrome/browser/ui/toolbar/media_router_action_unittest.cc
+++ b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
@@ -14,11 +14,11 @@
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/site_instance.h"
#include "content/public/test/test_utils.h"
-#include "grit/theme_resources.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/color_palette.h"
#include "ui/gfx/image/image_unittest_util.h"
+#include "ui/gfx/paint_vector_icon.h"
using content::WebContents;
using media_router::MediaRouterDialogControllerImpl;
@@ -98,14 +98,16 @@ class MediaRouterActionUnitTest : public MediaRouterTest {
-1)),
fake_source1_("fakeSource1"),
fake_source2_("fakeSource2"),
- active_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_MEDIA_ROUTER_ACTIVE_ICON)),
- error_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_MEDIA_ROUTER_ERROR_ICON)),
- idle_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_MEDIA_ROUTER_IDLE_ICON)),
- warning_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_MEDIA_ROUTER_WARNING_ICON)) {}
+ active_icon_(
+ gfx::CreateVectorIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE,
+ gfx::kPlaceholderColor)),
+ error_icon_(gfx::CreateVectorIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR,
+ gfx::kPlaceholderColor)),
+ idle_icon_(gfx::CreateVectorIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE,
+ gfx::kPlaceholderColor)),
+ warning_icon_(
+ gfx::CreateVectorIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING,
+ gfx::kPlaceholderColor)) {}
~MediaRouterActionUnitTest() override {}
« no previous file with comments | « chrome/browser/ui/toolbar/media_router_action.cc ('k') | ui/gfx/paint_vector_icon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698