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

Unified Diff: chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc

Issue 1566563002: Vectorize CrOS window control icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dummy GetIcon impl in TestToolbarModel Created 4 years, 11 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/views/frame/web_app_left_header_view_ash.cc ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc
diff --git a/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc b/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc
index 50f11780dd6bb32e7d6084adaccb52a2ace21a0a..1c20979fdf717051d244c7daab00d0016ed26550 100644
--- a/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc
+++ b/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc
@@ -19,6 +19,7 @@
#include "grit/components_scaled_resources.h"
#include "grit/theme_resources.h"
#include "ui/aura/window.h"
+#include "ui/gfx/vector_icons_public.h"
#include "ui/views/controls/button/button.h"
#include "url/gurl.h"
@@ -43,7 +44,7 @@ class WebAppLeftHeaderViewTest : public TestWithBrowserView {
test_toolbar_model_ = new TestToolbarModel();
scoped_ptr<ToolbarModel> toolbar_model(test_toolbar_model_);
browser()->swap_toolbar_models(&toolbar_model);
- test_toolbar_model_->set_icon(IDR_LOCATION_BAR_HTTP);
+ test_toolbar_model_->set_icon(gfx::VectorIconId::LOCATION_BAR_HTTP);
AddTab(browser(), GURL("about:blank"));
NavigateAndCommitActiveTab(GURL("http://www.google.com"));
@@ -123,11 +124,13 @@ TEST_F(WebAppLeftHeaderViewTest, LocationIcon) {
ASSERT_TRUE(view);
// The location icon should be non-secure one.
- EXPECT_EQ(IDR_LOCATION_BAR_HTTP, view->location_icon_->icon_image_id());
+ EXPECT_EQ(gfx::VectorIconId::LOCATION_BAR_HTTP,
+ view->location_icon_->icon_image_id());
- test_toolbar_model_->set_icon(IDR_OMNIBOX_HTTPS_VALID);
+ test_toolbar_model_->set_icon(gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID);
NavigateAndCommitActiveTab(GURL("https://secure.google.com"));
// The location icon should now be the secure one.
- EXPECT_EQ(IDR_OMNIBOX_HTTPS_VALID, view->location_icon_->icon_image_id());
+ EXPECT_EQ(gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID,
+ view->location_icon_->icon_image_id());
}
« no previous file with comments | « chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698