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

Unified Diff: ash/wm/custom_frame_view_ash_unittest.cc

Issue 148003003: Use white header for app windows part #2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | « ash/wm/custom_frame_view_ash.cc ('k') | ash/wm/header_painter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/custom_frame_view_ash_unittest.cc
diff --git a/ash/wm/custom_frame_view_ash_unittest.cc b/ash/wm/custom_frame_view_ash_unittest.cc
index 8fa65aa504e75ac04e2fa16b4f98abd20be63489..97d37f19e60ac4617c0ed2c95264bda235a62b87 100644
--- a/ash/wm/custom_frame_view_ash_unittest.cc
+++ b/ash/wm/custom_frame_view_ash_unittest.cc
@@ -61,7 +61,7 @@ TEST_F(CustomFrameViewAshTest, HeaderHeight) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
gfx::ImageSkia* close_button =
- rb.GetImageSkiaNamed(IDR_AURA_WINDOW_MAXIMIZED_CLOSE);
+ rb.GetImageSkiaNamed(IDR_AURA_WINDOW_CONTROL_BACKGROUND_H);
// |kSeparatorSize| should match |kHeaderContentSeparatorSize| in
// header_painter.cc
@@ -75,7 +75,6 @@ TEST_F(CustomFrameViewAshTest, HeaderHeight) {
delegate->custom_frame_view()->GetHeaderView()->height());
widget->Maximize();
- close_button = rb.GetImageSkiaNamed(IDR_AURA_WINDOW_MAXIMIZED_CLOSE2);
EXPECT_EQ(close_button->height() + kSeparatorSize,
delegate->custom_frame_view()->GetHeaderView()->height());
}
« no previous file with comments | « ash/wm/custom_frame_view_ash.cc ('k') | ash/wm/header_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698