| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 } | 343 } |
| 344 | 344 |
| 345 virtual bool GetAccessibleRole(AccessibilityTypes::Role* role) { | 345 virtual bool GetAccessibleRole(AccessibilityTypes::Role* role) { |
| 346 DCHECK(role); | 346 DCHECK(role); |
| 347 | 347 |
| 348 *role = AccessibilityTypes::ROLE_SEPARATOR; | 348 *role = AccessibilityTypes::ROLE_SEPARATOR; |
| 349 return true; | 349 return true; |
| 350 } | 350 } |
| 351 | 351 |
| 352 private: | 352 private: |
| 353 // Storage of strings needed for accessibility. | |
| 354 std::wstring accessible_name_; | |
| 355 | |
| 356 DISALLOW_COPY_AND_ASSIGN(ButtonSeparatorView); | 353 DISALLOW_COPY_AND_ASSIGN(ButtonSeparatorView); |
| 357 }; | 354 }; |
| 358 | 355 |
| 359 // BookmarkBarView ------------------------------------------------------------ | 356 // BookmarkBarView ------------------------------------------------------------ |
| 360 | 357 |
| 361 // static | 358 // static |
| 362 const int BookmarkBarView::kMaxButtonWidth = 150; | 359 const int BookmarkBarView::kMaxButtonWidth = 150; |
| 363 const int BookmarkBarView::kNewtabHorizontalPadding = 8; | 360 const int BookmarkBarView::kNewtabHorizontalPadding = 8; |
| 364 const int BookmarkBarView::kNewtabVerticalPadding = 12; | 361 const int BookmarkBarView::kNewtabVerticalPadding = 12; |
| 365 | 362 |
| (...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1711 // The tooltip is the only way we have to display text explaining the error | 1708 // The tooltip is the only way we have to display text explaining the error |
| 1712 // to the user. | 1709 // to the user. |
| 1713 sync_error_button->SetTooltipText( | 1710 sync_error_button->SetTooltipText( |
| 1714 l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)); | 1711 l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)); |
| 1715 sync_error_button->SetAccessibleName( | 1712 sync_error_button->SetAccessibleName( |
| 1716 l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON)); | 1713 l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON)); |
| 1717 sync_error_button->SetIcon( | 1714 sync_error_button->SetIcon( |
| 1718 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); | 1715 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); |
| 1719 return sync_error_button; | 1716 return sync_error_button; |
| 1720 } | 1717 } |
| OLD | NEW |