OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h" | 5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/ui/layout_constants.h" | 10 #include "chrome/browser/ui/layout_constants.h" |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 | 332 |
333 // Widgets: | 333 // Widgets: |
334 views::ImageButton* minimize_button_ = nullptr; | 334 views::ImageButton* minimize_button_ = nullptr; |
335 views::ImageButton* maximize_button_ = nullptr; | 335 views::ImageButton* maximize_button_ = nullptr; |
336 views::ImageButton* restore_button_ = nullptr; | 336 views::ImageButton* restore_button_ = nullptr; |
337 views::ImageButton* close_button_ = nullptr; | 337 views::ImageButton* close_button_ = nullptr; |
338 | 338 |
339 TabIconView* tab_icon_view_ = nullptr; | 339 TabIconView* tab_icon_view_ = nullptr; |
340 views::Label* window_title_ = nullptr; | 340 views::Label* window_title_ = nullptr; |
341 | 341 |
342 AvatarMenuButton* menu_button_ = nullptr; | |
343 views::MenuButton* avatar_button_ = nullptr; | 342 views::MenuButton* avatar_button_ = nullptr; |
344 | 343 |
345 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayoutTest); | 344 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayoutTest); |
346 }; | 345 }; |
347 | 346 |
348 TEST_F(OpaqueBrowserFrameViewLayoutTest, BasicWindow) { | 347 TEST_F(OpaqueBrowserFrameViewLayoutTest, BasicWindow) { |
349 // Tests the layout of a default chrome window with no avatars, no window | 348 // Tests the layout of a default chrome window with no avatars, no window |
350 // titles, and a tabstrip. | 349 // titles, and a tabstrip. |
351 | 350 |
352 for (int i = 0; i < 2; ++i) { | 351 for (int i = 0; i < 2; ++i) { |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 | 425 |
427 for (int i = 0; i < 2; ++i) { | 426 for (int i = 0; i < 2; ++i) { |
428 root_view_->Layout(); | 427 root_view_->Layout(); |
429 SCOPED_TRACE(i == 0 ? "Window is restored" : "Window is maximized"); | 428 SCOPED_TRACE(i == 0 ? "Window is restored" : "Window is maximized"); |
430 ExpectCaptionButtons(false, 0); | 429 ExpectCaptionButtons(false, 0); |
431 ExpectTabStripAndMinimumSize(false); | 430 ExpectTabStripAndMinimumSize(false); |
432 ExpectAvatar(); | 431 ExpectAvatar(); |
433 delegate_->set_maximized(true); | 432 delegate_->set_maximized(true); |
434 } | 433 } |
435 } | 434 } |
OLD | NEW |