OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/bookmark_bar_view.h" | 5 #include "chrome/browser/views/bookmark_bar_view.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
| 9 #include "app/l10n_util.h" |
9 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
10 #include "base/string_util.h" | 11 #include "base/string_util.h" |
11 #include "base/base_drag_source.h" | 12 #include "base/base_drag_source.h" |
12 #include "chrome/browser/bookmarks/bookmark_context_menu.h" | 13 #include "chrome/browser/bookmarks/bookmark_context_menu.h" |
13 #include "chrome/browser/bookmarks/bookmark_utils.h" | 14 #include "chrome/browser/bookmarks/bookmark_utils.h" |
14 #include "chrome/browser/browser.h" | 15 #include "chrome/browser/browser.h" |
15 #include "chrome/browser/drag_utils.h" | 16 #include "chrome/browser/drag_utils.h" |
16 #include "chrome/browser/extensions/extension.h" | 17 #include "chrome/browser/extensions/extension.h" |
17 #include "chrome/browser/extensions/extension_view.h" | 18 #include "chrome/browser/extensions/extension_view.h" |
18 #include "chrome/browser/extensions/extensions_service.h" | 19 #include "chrome/browser/extensions/extensions_service.h" |
19 #include "chrome/browser/metrics/user_metrics.h" | 20 #include "chrome/browser/metrics/user_metrics.h" |
20 #include "chrome/browser/profile.h" | 21 #include "chrome/browser/profile.h" |
21 #include "chrome/browser/renderer_host/render_view_host.h" | 22 #include "chrome/browser/renderer_host/render_view_host.h" |
22 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 23 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
23 #include "chrome/browser/tab_contents/page_navigator.h" | 24 #include "chrome/browser/tab_contents/page_navigator.h" |
24 #include "chrome/browser/tab_contents/tab_contents.h" | 25 #include "chrome/browser/tab_contents/tab_contents.h" |
25 #include "chrome/browser/view_ids.h" | 26 #include "chrome/browser/view_ids.h" |
26 #include "chrome/browser/views/event_utils.h" | 27 #include "chrome/browser/views/event_utils.h" |
27 #include "chrome/common/gfx/chrome_canvas.h" | 28 #include "chrome/common/gfx/chrome_canvas.h" |
28 #include "chrome/common/gfx/text_elider.h" | 29 #include "chrome/common/gfx/text_elider.h" |
29 #include "chrome/common/l10n_util.h" | |
30 #include "chrome/common/notification_service.h" | 30 #include "chrome/common/notification_service.h" |
31 #include "chrome/common/os_exchange_data.h" | 31 #include "chrome/common/os_exchange_data.h" |
32 #include "chrome/common/page_transition_types.h" | 32 #include "chrome/common/page_transition_types.h" |
33 #include "chrome/common/pref_names.h" | 33 #include "chrome/common/pref_names.h" |
34 #include "chrome/common/pref_service.h" | 34 #include "chrome/common/pref_service.h" |
35 #include "chrome/common/win_util.h" | 35 #include "chrome/common/win_util.h" |
36 #include "chrome/views/controls/button/menu_button.h" | 36 #include "chrome/views/controls/button/menu_button.h" |
37 #include "chrome/views/controls/menu/chrome_menu.h" | 37 #include "chrome/views/controls/menu/chrome_menu.h" |
38 #include "chrome/views/view_constants.h" | 38 #include "chrome/views/view_constants.h" |
39 #include "chrome/views/widget/tooltip_manager.h" | 39 #include "chrome/views/widget/tooltip_manager.h" |
(...skipping 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1714 } | 1714 } |
1715 | 1715 |
1716 void BookmarkBarView::StopThrobbing(bool immediate) { | 1716 void BookmarkBarView::StopThrobbing(bool immediate) { |
1717 if (!throbbing_view_) | 1717 if (!throbbing_view_) |
1718 return; | 1718 return; |
1719 | 1719 |
1720 // If not immediate, cycle through 2 more complete cycles. | 1720 // If not immediate, cycle through 2 more complete cycles. |
1721 throbbing_view_->StartThrobbing(immediate ? 0 : 4); | 1721 throbbing_view_->StartThrobbing(immediate ? 0 : 4); |
1722 throbbing_view_ = NULL; | 1722 throbbing_view_ = NULL; |
1723 } | 1723 } |
OLD | NEW |