| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/bookmarks/bookmark_bar_view.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 #include "ui/base/accessibility/accessible_view_state.h" | 49 #include "ui/base/accessibility/accessible_view_state.h" |
| 50 #include "ui/base/animation/slide_animation.h" | 50 #include "ui/base/animation/slide_animation.h" |
| 51 #include "ui/base/dragdrop/os_exchange_data.h" | 51 #include "ui/base/dragdrop/os_exchange_data.h" |
| 52 #include "ui/base/l10n/l10n_util.h" | 52 #include "ui/base/l10n/l10n_util.h" |
| 53 #include "ui/base/resource/resource_bundle.h" | 53 #include "ui/base/resource/resource_bundle.h" |
| 54 #include "ui/base/text/text_elider.h" | 54 #include "ui/base/text/text_elider.h" |
| 55 #include "ui/gfx/canvas_skia.h" | 55 #include "ui/gfx/canvas_skia.h" |
| 56 #include "ui/views/controls/button/menu_button.h" | 56 #include "ui/views/controls/button/menu_button.h" |
| 57 #include "ui/views/controls/label.h" | 57 #include "ui/views/controls/label.h" |
| 58 #include "ui/views/controls/menu/menu_item_view.h" | 58 #include "ui/views/controls/menu/menu_item_view.h" |
| 59 #include "ui/views/drag_utils.h" |
| 60 #include "ui/views/metrics.h" |
| 59 #include "ui/views/widget/tooltip_manager.h" | 61 #include "ui/views/widget/tooltip_manager.h" |
| 60 #include "ui/views/widget/widget.h" | 62 #include "ui/views/widget/widget.h" |
| 61 #include "views/drag_utils.h" | |
| 62 #include "views/metrics.h" | |
| 63 #include "views/view_constants.h" | 63 #include "views/view_constants.h" |
| 64 | 64 |
| 65 using views::CustomButton; | 65 using views::CustomButton; |
| 66 using views::DropTargetEvent; | 66 using views::DropTargetEvent; |
| 67 using views::MenuButton; | 67 using views::MenuButton; |
| 68 using views::MenuItemView; | 68 using views::MenuItemView; |
| 69 using views::View; | 69 using views::View; |
| 70 | 70 |
| 71 // How much we want the bookmark bar to overlap the toolbar when in its | 71 // How much we want the bookmark bar to overlap the toolbar when in its |
| 72 // 'always shown' mode. | 72 // 'always shown' mode. |
| (...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1659 (1 - size_animation_->GetCurrentValue()))); | 1659 (1 - size_animation_->GetCurrentValue()))); |
| 1660 } else { | 1660 } else { |
| 1661 prefsize.set_height( | 1661 prefsize.set_height( |
| 1662 static_cast<int>( | 1662 static_cast<int>( |
| 1663 browser_defaults::kBookmarkBarHeight * | 1663 browser_defaults::kBookmarkBarHeight * |
| 1664 size_animation_->GetCurrentValue())); | 1664 size_animation_->GetCurrentValue())); |
| 1665 } | 1665 } |
| 1666 } | 1666 } |
| 1667 return prefsize; | 1667 return prefsize; |
| 1668 } | 1668 } |
| OLD | NEW |