| 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/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/ui/views/avatar_label.h" | 10 #include "chrome/browser/ui/views/profiles/avatar_label.h" |
| 11 #include "chrome/browser/ui/views/avatar_menu_button.h" | 11 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" |
| 12 #include "chrome/browser/ui/views/tab_icon_view.h" | 12 #include "chrome/browser/ui/views/tab_icon_view.h" |
| 13 #include "chrome/browser/ui/views/tabs/tab.h" | 13 #include "chrome/browser/ui/views/tabs/tab.h" |
| 14 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
| 15 #include "ui/gfx/image/image_skia.h" | 15 #include "ui/gfx/image/image_skia.h" |
| 16 #include "ui/gfx/image/image_skia_rep.h" | 16 #include "ui/gfx/image/image_skia_rep.h" |
| 17 #include "ui/gfx/text_constants.h" | 17 #include "ui/gfx/text_constants.h" |
| 18 #include "ui/views/controls/button/image_button.h" | 18 #include "ui/views/controls/button/image_button.h" |
| 19 #include "ui/views/controls/button/menu_button.h" | 19 #include "ui/views/controls/button/menu_button.h" |
| 20 #include "ui/views/controls/label.h" | 20 #include "ui/views/controls/label.h" |
| 21 #include "ui/views/test/views_test_base.h" | 21 #include "ui/views/test/views_test_base.h" |
| (...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 | 545 |
| 546 // Check the location of the avatar label relative to the avatar button if | 546 // Check the location of the avatar label relative to the avatar button if |
| 547 // both are displayed on the left side. | 547 // both are displayed on the left side. |
| 548 // The label height and width depends on the font size and the text displayed. | 548 // The label height and width depends on the font size and the text displayed. |
| 549 // This may possibly change, so we don't test it here. | 549 // This may possibly change, so we don't test it here. |
| 550 EXPECT_EQ(menu_button_->bounds().x() - 2, avatar_label_->bounds().x()); | 550 EXPECT_EQ(menu_button_->bounds().x() - 2, avatar_label_->bounds().x()); |
| 551 EXPECT_EQ( | 551 EXPECT_EQ( |
| 552 menu_button_->bounds().bottom() - 3 - avatar_label_->bounds().height(), | 552 menu_button_->bounds().bottom() - 3 - avatar_label_->bounds().height(), |
| 553 avatar_label_->bounds().y()); | 553 avatar_label_->bounds().y()); |
| 554 } | 554 } |
| OLD | NEW |