| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 #include <stddef.h> | 6 #include <stddef.h> |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 1622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1633 CGFloat material_view_widths_yosemite[] = | 1633 CGFloat material_view_widths_yosemite[] = |
| 1634 { 140.0, 141.0, 150.0, 151.0, 152.0, 153.0, | 1634 { 140.0, 141.0, 150.0, 151.0, 152.0, 153.0, |
| 1635 154.0, 200.0, 154.0, 153.0, 152.0, 151.0, | 1635 154.0, 200.0, 154.0, 153.0, 152.0, 151.0, |
| 1636 150.0, 141.0, 140.0 }; | 1636 150.0, 141.0, 140.0 }; |
| 1637 CGFloat material_view_widths_rest[] = | 1637 CGFloat material_view_widths_rest[] = |
| 1638 { 142.0, 143.0, 153.0, 154.0, 155.0, 156.0, | 1638 { 142.0, 143.0, 153.0, 154.0, 155.0, 156.0, |
| 1639 157.0, 200.0, 157.0, 156.0, 155.0, 154.0, | 1639 157.0, 200.0, 157.0, 156.0, 155.0, 154.0, |
| 1640 153.0, 143.0, 142.0 }; | 1640 153.0, 143.0, 142.0 }; |
| 1641 CGFloat* view_widths = NULL; | 1641 CGFloat* view_widths = NULL; |
| 1642 bool is_mode_material = ui::MaterialDesignController::IsModeMaterial(); | 1642 bool is_mode_material = ui::MaterialDesignController::IsModeMaterial(); |
| 1643 if (base::mac::IsOSElCapitan()) { | 1643 if (base::mac::IsOS10_11()) { |
| 1644 view_widths = is_mode_material ? material_view_widths_el_capitan | 1644 view_widths = is_mode_material ? material_view_widths_el_capitan |
| 1645 : view_widths_el_capitan; | 1645 : view_widths_el_capitan; |
| 1646 } else if (base::mac::IsOSYosemite()) { | 1646 } else if (base::mac::IsOS10_10()) { |
| 1647 view_widths = is_mode_material ? material_view_widths_yosemite | 1647 view_widths = is_mode_material ? material_view_widths_yosemite |
| 1648 : view_widths_yosemite; | 1648 : view_widths_yosemite; |
| 1649 } else { | 1649 } else { |
| 1650 view_widths = is_mode_material ? material_view_widths_rest | 1650 view_widths = is_mode_material ? material_view_widths_rest |
| 1651 : view_widths_rest; | 1651 : view_widths_rest; |
| 1652 } | 1652 } |
| 1653 | 1653 |
| 1654 BOOL off_the_side_button_is_hidden_results[] = | 1654 BOOL off_the_side_button_is_hidden_results[] = |
| 1655 { NO, NO, NO, NO, YES, YES, YES, YES, YES, YES, YES, NO, NO, NO, NO}; | 1655 { NO, NO, NO, NO, YES, YES, YES, YES, YES, YES, YES, NO, NO, NO, NO}; |
| 1656 int displayed_button_count_results[] = | 1656 int displayed_button_count_results[] = |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2205 "2f3b ] 4b "); | 2205 "2f3b ] 4b "); |
| 2206 actual = bookmarks::test::ModelStringFromNode(root); | 2206 actual = bookmarks::test::ModelStringFromNode(root); |
| 2207 EXPECT_EQ(expected, actual); | 2207 EXPECT_EQ(expected, actual); |
| 2208 | 2208 |
| 2209 // Verify that the other bookmark folder can't be deleted. | 2209 // Verify that the other bookmark folder can't be deleted. |
| 2210 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; | 2210 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; |
| 2211 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); | 2211 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); |
| 2212 } | 2212 } |
| 2213 | 2213 |
| 2214 } // namespace | 2214 } // namespace |
| OLD | NEW |