| 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 "base/base_drag_source.h" | 9 #include "base/base_drag_source.h" |
| 10 #include "base/gfx/skia_utils.h" | |
| 11 #include "chrome/app/theme/theme_resources.h" | 10 #include "chrome/app/theme/theme_resources.h" |
| 12 #include "chrome/browser/bookmarks/bookmark_context_menu.h" | 11 #include "chrome/browser/bookmarks/bookmark_context_menu.h" |
| 13 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 14 #include "chrome/browser/browser.h" | 13 #include "chrome/browser/browser.h" |
| 15 #include "chrome/browser/browser_list.h" | 14 #include "chrome/browser/browser_list.h" |
| 16 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
| 17 #include "chrome/browser/browser_window.h" | 16 #include "chrome/browser/browser_window.h" |
| 18 #include "chrome/browser/drag_utils.h" | 17 #include "chrome/browser/drag_utils.h" |
| 19 #include "chrome/browser/download/download_util.h" | 18 #include "chrome/browser/download/download_util.h" |
| 20 #include "chrome/browser/history/history.h" | 19 #include "chrome/browser/history/history.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 38 #include "chrome/common/pref_service.h" | 37 #include "chrome/common/pref_service.h" |
| 39 #include "chrome/common/resource_bundle.h" | 38 #include "chrome/common/resource_bundle.h" |
| 40 #include "chrome/common/win_util.h" | 39 #include "chrome/common/win_util.h" |
| 41 #include "chrome/views/chrome_menu.h" | 40 #include "chrome/views/chrome_menu.h" |
| 42 #include "chrome/views/menu_button.h" | 41 #include "chrome/views/menu_button.h" |
| 43 #include "chrome/views/tooltip_manager.h" | 42 #include "chrome/views/tooltip_manager.h" |
| 44 #include "chrome/views/view_constants.h" | 43 #include "chrome/views/view_constants.h" |
| 45 #include "chrome/views/widget.h" | 44 #include "chrome/views/widget.h" |
| 46 #include "chrome/views/window.h" | 45 #include "chrome/views/window.h" |
| 47 #include "generated_resources.h" | 46 #include "generated_resources.h" |
| 47 #include "skia/ext/skia_utils_win.h" |
| 48 | 48 |
| 49 using views::BaseButton; | 49 using views::BaseButton; |
| 50 using views::DropTargetEvent; | 50 using views::DropTargetEvent; |
| 51 using views::MenuButton; | 51 using views::MenuButton; |
| 52 using views::MenuItemView; | 52 using views::MenuItemView; |
| 53 using views::View; | 53 using views::View; |
| 54 | 54 |
| 55 // Margins around the content. | 55 // Margins around the content. |
| 56 static const int kTopMargin = 2; | 56 static const int kTopMargin = 2; |
| 57 static const int kBottomMargin = 3; | 57 static const int kBottomMargin = 3; |
| (...skipping 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1837 } | 1837 } |
| 1838 | 1838 |
| 1839 void BookmarkBarView::StopThrobbing(bool immediate) { | 1839 void BookmarkBarView::StopThrobbing(bool immediate) { |
| 1840 if (!throbbing_view_) | 1840 if (!throbbing_view_) |
| 1841 return; | 1841 return; |
| 1842 | 1842 |
| 1843 // If not immediate, cycle through 2 more complete cycles. | 1843 // If not immediate, cycle through 2 more complete cycles. |
| 1844 throbbing_view_->StartThrobbing(immediate ? 0 : 4); | 1844 throbbing_view_->StartThrobbing(immediate ? 0 : 4); |
| 1845 throbbing_view_ = NULL; | 1845 throbbing_view_ = NULL; |
| 1846 } | 1846 } |
| OLD | NEW |