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

Side by Side Diff: ash/frame/caption_buttons/frame_size_button_unittest.cc

Issue 934503002: Ash frames: dark frames now use white caption buttons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/frame/caption_buttons/frame_size_button.h" 5 #include "ash/frame/caption_buttons/frame_size_button.h"
6 6
7 #include "ash/frame/caption_buttons/frame_caption_button.h" 7 #include "ash/frame/caption_buttons/frame_caption_button.h"
8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" 8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 if (details.is_add && details.child == this) { 56 if (details.is_add && details.child == this) {
57 caption_button_container_ = 57 caption_button_container_ =
58 new FrameCaptionButtonContainerView(GetWidget()); 58 new FrameCaptionButtonContainerView(GetWidget());
59 59
60 // Set arbitrary images for the container's buttons so that the buttons 60 // Set arbitrary images for the container's buttons so that the buttons
61 // have non-empty sizes. 61 // have non-empty sizes.
62 for (int icon = 0; icon < CAPTION_BUTTON_ICON_COUNT; ++icon) { 62 for (int icon = 0; icon < CAPTION_BUTTON_ICON_COUNT; ++icon) {
63 caption_button_container_->SetButtonImages( 63 caption_button_container_->SetButtonImages(
64 static_cast<CaptionButtonIcon>(icon), 64 static_cast<CaptionButtonIcon>(icon),
65 IDR_AURA_WINDOW_CONTROL_ICON_CLOSE, 65 IDR_AURA_WINDOW_CONTROL_ICON_CLOSE,
66 IDR_AURA_WINDOW_CONTROL_ICON_CLOSE_I,
67 IDR_AURA_WINDOW_CONTROL_BACKGROUND_H, 66 IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
68 IDR_AURA_WINDOW_CONTROL_BACKGROUND_P); 67 IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
69 } 68 }
70 69
71 AddChildView(caption_button_container_); 70 AddChildView(caption_button_container_);
72 } 71 }
73 } 72 }
74 73
75 // Not owned. 74 // Not owned.
76 ash::FrameCaptionButtonContainerView* caption_button_container_; 75 ash::FrameCaptionButtonContainerView* caption_button_container_;
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 458
460 // None of the buttons should stay pressed and the buttons should have their 459 // None of the buttons should stay pressed and the buttons should have their
461 // regular icons. 460 // regular icons.
462 EXPECT_TRUE(AllButtonsInNormalState()); 461 EXPECT_TRUE(AllButtonsInNormalState());
463 EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon()); 462 EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon());
464 EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon()); 463 EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon());
465 } 464 }
466 465
467 } // namespace test 466 } // namespace test
468 } // namespace ash 467 } // namespace ash
OLDNEW
« no previous file with comments | « ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc ('k') | ash/frame/default_header_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698