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 #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 30 matching lines...) Expand all Loading... |
41 #include "content/public/browser/notification_details.h" | 41 #include "content/public/browser/notification_details.h" |
42 #include "content/public/browser/notification_source.h" | 42 #include "content/public/browser/notification_source.h" |
43 #include "content/public/browser/page_navigator.h" | 43 #include "content/public/browser/page_navigator.h" |
44 #include "content/public/browser/render_view_host.h" | 44 #include "content/public/browser/render_view_host.h" |
45 #include "content/public/browser/render_widget_host_view.h" | 45 #include "content/public/browser/render_widget_host_view.h" |
46 #include "content/public/browser/user_metrics.h" | 46 #include "content/public/browser/user_metrics.h" |
47 #include "content/public/browser/web_contents.h" | 47 #include "content/public/browser/web_contents.h" |
48 #include "content/public/common/page_transition_types.h" | 48 #include "content/public/common/page_transition_types.h" |
49 #include "grit/generated_resources.h" | 49 #include "grit/generated_resources.h" |
50 #include "grit/theme_resources.h" | 50 #include "grit/theme_resources.h" |
| 51 #include "grit/theme_resources_standard.h" |
51 #include "grit/ui_resources.h" | 52 #include "grit/ui_resources.h" |
52 #include "ui/base/accessibility/accessible_view_state.h" | 53 #include "ui/base/accessibility/accessible_view_state.h" |
53 #include "ui/base/animation/slide_animation.h" | 54 #include "ui/base/animation/slide_animation.h" |
54 #include "ui/base/dragdrop/drag_utils.h" | 55 #include "ui/base/dragdrop/drag_utils.h" |
55 #include "ui/base/dragdrop/os_exchange_data.h" | 56 #include "ui/base/dragdrop/os_exchange_data.h" |
56 #include "ui/base/l10n/l10n_util.h" | 57 #include "ui/base/l10n/l10n_util.h" |
57 #include "ui/base/resource/resource_bundle.h" | 58 #include "ui/base/resource/resource_bundle.h" |
58 #include "ui/base/text/text_elider.h" | 59 #include "ui/base/text/text_elider.h" |
59 #include "ui/gfx/canvas.h" | 60 #include "ui/gfx/canvas.h" |
60 #include "ui/views/button_drag_utils.h" | 61 #include "ui/views/button_drag_utils.h" |
(...skipping 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1672 (1 - size_animation_->GetCurrentValue()))); | 1673 (1 - size_animation_->GetCurrentValue()))); |
1673 } else { | 1674 } else { |
1674 prefsize.set_height( | 1675 prefsize.set_height( |
1675 static_cast<int>( | 1676 static_cast<int>( |
1676 browser_defaults::kBookmarkBarHeight * | 1677 browser_defaults::kBookmarkBarHeight * |
1677 size_animation_->GetCurrentValue())); | 1678 size_animation_->GetCurrentValue())); |
1678 } | 1679 } |
1679 } | 1680 } |
1680 return prefsize; | 1681 return prefsize; |
1681 } | 1682 } |
OLD | NEW |