| 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 22 matching lines...) Expand all Loading... |
| 33 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 33 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 34 #include "chrome/common/chrome_notification_types.h" | 34 #include "chrome/common/chrome_notification_types.h" |
| 35 #include "chrome/common/chrome_switches.h" | 35 #include "chrome/common/chrome_switches.h" |
| 36 #include "chrome/common/extensions/extension_constants.h" | 36 #include "chrome/common/extensions/extension_constants.h" |
| 37 #include "chrome/common/pref_names.h" | 37 #include "chrome/common/pref_names.h" |
| 38 #include "content/browser/renderer_host/render_view_host.h" | 38 #include "content/browser/renderer_host/render_view_host.h" |
| 39 #include "content/browser/renderer_host/render_widget_host_view.h" | 39 #include "content/browser/renderer_host/render_widget_host_view.h" |
| 40 #include "content/browser/tab_contents/page_navigator.h" | 40 #include "content/browser/tab_contents/page_navigator.h" |
| 41 #include "content/browser/tab_contents/tab_contents.h" | 41 #include "content/browser/tab_contents/tab_contents.h" |
| 42 #include "content/browser/user_metrics.h" | 42 #include "content/browser/user_metrics.h" |
| 43 #include "content/common/notification_service.h" | 43 #include "content/public/browser/notification_details.h" |
| 44 #include "content/public/browser/notification_source.h" |
| 44 #include "content/public/common/page_transition_types.h" | 45 #include "content/public/common/page_transition_types.h" |
| 45 #include "grit/generated_resources.h" | 46 #include "grit/generated_resources.h" |
| 46 #include "grit/theme_resources.h" | 47 #include "grit/theme_resources.h" |
| 47 #include "grit/ui_resources.h" | 48 #include "grit/ui_resources.h" |
| 48 #include "ui/base/accessibility/accessible_view_state.h" | 49 #include "ui/base/accessibility/accessible_view_state.h" |
| 49 #include "ui/base/animation/slide_animation.h" | 50 #include "ui/base/animation/slide_animation.h" |
| 50 #include "ui/base/dragdrop/os_exchange_data.h" | 51 #include "ui/base/dragdrop/os_exchange_data.h" |
| 51 #include "ui/base/l10n/l10n_util.h" | 52 #include "ui/base/l10n/l10n_util.h" |
| 52 #include "ui/base/resource/resource_bundle.h" | 53 #include "ui/base/resource/resource_bundle.h" |
| 53 #include "ui/base/text/text_elider.h" | 54 #include "ui/base/text/text_elider.h" |
| (...skipping 1684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1738 (1 - size_animation_->GetCurrentValue()))); | 1739 (1 - size_animation_->GetCurrentValue()))); |
| 1739 } else { | 1740 } else { |
| 1740 prefsize.set_height( | 1741 prefsize.set_height( |
| 1741 static_cast<int>( | 1742 static_cast<int>( |
| 1742 browser_defaults::kBookmarkBarHeight * | 1743 browser_defaults::kBookmarkBarHeight * |
| 1743 size_animation_->GetCurrentValue())); | 1744 size_animation_->GetCurrentValue())); |
| 1744 } | 1745 } |
| 1745 } | 1746 } |
| 1746 return prefsize; | 1747 return prefsize; |
| 1747 } | 1748 } |
| OLD | NEW |