| OLD | NEW |
| 1 // Copyright (c) 2010 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/views/bookmark_bar_view.h" | 5 #include "chrome/browser/ui/views/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> |
| 11 | 11 |
| 12 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" |
| 13 #include "app/os_exchange_data.h" | 13 #include "app/os_exchange_data.h" |
| 14 #include "app/resource_bundle.h" | 14 #include "app/resource_bundle.h" |
| 15 #include "app/text_elider.h" | 15 #include "app/text_elider.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 46 #include "views/controls/button/menu_button.h" | 46 #include "views/controls/button/menu_button.h" |
| 47 #include "views/controls/label.h" | 47 #include "views/controls/label.h" |
| 48 #include "views/controls/menu/menu_item_view.h" | 48 #include "views/controls/menu/menu_item_view.h" |
| 49 #include "views/drag_utils.h" | 49 #include "views/drag_utils.h" |
| 50 #include "views/view_constants.h" | 50 #include "views/view_constants.h" |
| 51 #include "views/widget/tooltip_manager.h" | 51 #include "views/widget/tooltip_manager.h" |
| 52 #include "views/widget/widget.h" | 52 #include "views/widget/widget.h" |
| 53 #include "views/window/window.h" | 53 #include "views/window/window.h" |
| 54 | 54 |
| 55 #if defined(OS_WIN) | 55 #if defined(OS_WIN) |
| 56 #include "chrome/browser/views/importer_view.h" | 56 #include "chrome/browser/ui/views/importer_view.h" |
| 57 #endif | 57 #endif |
| 58 | 58 |
| 59 using views::CustomButton; | 59 using views::CustomButton; |
| 60 using views::DropTargetEvent; | 60 using views::DropTargetEvent; |
| 61 using views::MenuButton; | 61 using views::MenuButton; |
| 62 using views::MenuItemView; | 62 using views::MenuItemView; |
| 63 using views::View; | 63 using views::View; |
| 64 | 64 |
| 65 // How much we want the bookmark bar to overlap the toolbar when in its | 65 // How much we want the bookmark bar to overlap the toolbar when in its |
| 66 // 'always shown' mode. | 66 // 'always shown' mode. |
| (...skipping 1667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1734 // The tooltip is the only way we have to display text explaining the error | 1734 // The tooltip is the only way we have to display text explaining the error |
| 1735 // to the user. | 1735 // to the user. |
| 1736 sync_error_button->SetTooltipText( | 1736 sync_error_button->SetTooltipText( |
| 1737 UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC))); | 1737 UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC))); |
| 1738 sync_error_button->SetAccessibleName( | 1738 sync_error_button->SetAccessibleName( |
| 1739 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON))); | 1739 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON))); |
| 1740 sync_error_button->SetIcon( | 1740 sync_error_button->SetIcon( |
| 1741 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); | 1741 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); |
| 1742 return sync_error_button; | 1742 return sync_error_button; |
| 1743 } | 1743 } |
| OLD | NEW |