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/gfx/chrome_canvas.h" | 9 #include "app/gfx/chrome_canvas.h" |
10 #include "app/gfx/text_elider.h" | 10 #include "app/gfx/text_elider.h" |
11 #include "app/l10n_util.h" | 11 #include "app/l10n_util.h" |
12 #include "app/os_exchange_data.h" | 12 #include "app/os_exchange_data.h" |
13 #include "app/resource_bundle.h" | 13 #include "app/resource_bundle.h" |
| 14 #include "app/win_util.h" |
14 #include "base/string_util.h" | 15 #include "base/string_util.h" |
15 #include "base/base_drag_source.h" | 16 #include "base/base_drag_source.h" |
16 #include "chrome/browser/bookmarks/bookmark_context_menu.h" | 17 #include "chrome/browser/bookmarks/bookmark_context_menu.h" |
17 #include "chrome/browser/bookmarks/bookmark_utils.h" | 18 #include "chrome/browser/bookmarks/bookmark_utils.h" |
18 #include "chrome/browser/browser.h" | 19 #include "chrome/browser/browser.h" |
19 #include "chrome/browser/extensions/extension.h" | 20 #include "chrome/browser/extensions/extension.h" |
20 #include "chrome/browser/extensions/extension_view.h" | 21 #include "chrome/browser/extensions/extension_view.h" |
21 #include "chrome/browser/extensions/extensions_service.h" | 22 #include "chrome/browser/extensions/extensions_service.h" |
22 #include "chrome/browser/metrics/user_metrics.h" | 23 #include "chrome/browser/metrics/user_metrics.h" |
23 #include "chrome/browser/profile.h" | 24 #include "chrome/browser/profile.h" |
24 #include "chrome/browser/renderer_host/render_view_host.h" | 25 #include "chrome/browser/renderer_host/render_view_host.h" |
25 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 26 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
26 #include "chrome/browser/tab_contents/page_navigator.h" | 27 #include "chrome/browser/tab_contents/page_navigator.h" |
27 #include "chrome/browser/tab_contents/tab_contents.h" | 28 #include "chrome/browser/tab_contents/tab_contents.h" |
28 #include "chrome/browser/view_ids.h" | 29 #include "chrome/browser/view_ids.h" |
29 #include "chrome/browser/views/event_utils.h" | 30 #include "chrome/browser/views/event_utils.h" |
30 #include "chrome/common/notification_service.h" | 31 #include "chrome/common/notification_service.h" |
31 #include "chrome/common/page_transition_types.h" | 32 #include "chrome/common/page_transition_types.h" |
32 #include "chrome/common/pref_names.h" | 33 #include "chrome/common/pref_names.h" |
33 #include "chrome/common/pref_service.h" | 34 #include "chrome/common/pref_service.h" |
34 #include "chrome/common/win_util.h" | |
35 #include "grit/generated_resources.h" | 35 #include "grit/generated_resources.h" |
36 #include "grit/theme_resources.h" | 36 #include "grit/theme_resources.h" |
37 #include "skia/ext/skia_utils.h" | 37 #include "skia/ext/skia_utils.h" |
38 #include "views/controls/button/menu_button.h" | 38 #include "views/controls/button/menu_button.h" |
39 #include "views/controls/menu/chrome_menu.h" | 39 #include "views/controls/menu/chrome_menu.h" |
40 #include "views/drag_utils.h" | 40 #include "views/drag_utils.h" |
41 #include "views/view_constants.h" | 41 #include "views/view_constants.h" |
42 #include "views/widget/tooltip_manager.h" | 42 #include "views/widget/tooltip_manager.h" |
43 #include "views/widget/widget.h" | 43 #include "views/widget/widget.h" |
44 #include "views/window/window.h" | 44 #include "views/window/window.h" |
(...skipping 1515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1560 } | 1560 } |
1561 | 1561 |
1562 void BookmarkBarView::StopThrobbing(bool immediate) { | 1562 void BookmarkBarView::StopThrobbing(bool immediate) { |
1563 if (!throbbing_view_) | 1563 if (!throbbing_view_) |
1564 return; | 1564 return; |
1565 | 1565 |
1566 // If not immediate, cycle through 2 more complete cycles. | 1566 // If not immediate, cycle through 2 more complete cycles. |
1567 throbbing_view_->StartThrobbing(immediate ? 0 : 4); | 1567 throbbing_view_->StartThrobbing(immediate ? 0 : 4); |
1568 throbbing_view_ = NULL; | 1568 throbbing_view_ = NULL; |
1569 } | 1569 } |
OLD | NEW |