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

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

Issue 1505223004: Do not use assets for Ash window control button backgrounds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WIP for pkasting and estade feedback Created 5 years 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 caption_button_container_->SetBounds(width() - preferred_size.width(), 0, 50 caption_button_container_->SetBounds(width() - preferred_size.width(), 0,
51 preferred_size.width(), preferred_size.height()); 51 preferred_size.width(), preferred_size.height());
52 } 52 }
53 53
54 void ViewHierarchyChanged( 54 void ViewHierarchyChanged(
55 const ViewHierarchyChangedDetails& details) override { 55 const ViewHierarchyChangedDetails& details) override {
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 button icons and assign a non-empty size.
61 // have non-empty sizes. 61 caption_button_container_->SetButtonSize(gfx::Size(32, 33));
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_->SetButtonImage(
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_BACKGROUND_H,
67 IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
68 } 66 }
69 67
70 AddChildView(caption_button_container_); 68 AddChildView(caption_button_container_);
71 } 69 }
72 } 70 }
73 71
74 // Not owned. 72 // Not owned.
75 ash::FrameCaptionButtonContainerView* caption_button_container_; 73 ash::FrameCaptionButtonContainerView* caption_button_container_;
76 74
77 DISALLOW_COPY_AND_ASSIGN(TestWidgetDelegate); 75 DISALLOW_COPY_AND_ASSIGN(TestWidgetDelegate);
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 456
459 // None of the buttons should stay pressed and the buttons should have their 457 // None of the buttons should stay pressed and the buttons should have their
460 // regular icons. 458 // regular icons.
461 EXPECT_TRUE(AllButtonsInNormalState()); 459 EXPECT_TRUE(AllButtonsInNormalState());
462 EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon()); 460 EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon());
463 EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon()); 461 EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon());
464 } 462 }
465 463
466 } // namespace test 464 } // namespace test
467 } // namespace ash 465 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698