| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1123 anchor_point, false); | 1123 anchor_point, false); |
| 1124 } | 1124 } |
| 1125 | 1125 |
| 1126 void BookmarkBarView::ButtonPressed(views::Button* sender, | 1126 void BookmarkBarView::ButtonPressed(views::Button* sender, |
| 1127 const views::Event& event) { | 1127 const views::Event& event) { |
| 1128 #ifdef CHROME_PERSONALIZATION | 1128 #ifdef CHROME_PERSONALIZATION |
| 1129 // Show the login wizard if the user clicked the re-login button. | 1129 // Show the login wizard if the user clicked the re-login button. |
| 1130 if (sender->tag() == kSyncErrorButtonTag) { | 1130 if (sender->tag() == kSyncErrorButtonTag) { |
| 1131 DCHECK(sender == sync_error_button_); | 1131 DCHECK(sender == sync_error_button_); |
| 1132 DCHECK(sync_service_); | 1132 DCHECK(sync_service_); |
| 1133 sync_service_->ShowLoginDialog(); | 1133 sync_service_->ShowLoginDialog(NULL); |
| 1134 return; | 1134 return; |
| 1135 } | 1135 } |
| 1136 #endif | 1136 #endif |
| 1137 | 1137 |
| 1138 const BookmarkNode* node; | 1138 const BookmarkNode* node; |
| 1139 if (sender->tag() == kOtherFolderButtonTag) { | 1139 if (sender->tag() == kOtherFolderButtonTag) { |
| 1140 node = model_->other_node(); | 1140 node = model_->other_node(); |
| 1141 } else { | 1141 } else { |
| 1142 int index = GetChildIndex(sender); | 1142 int index = GetChildIndex(sender); |
| 1143 DCHECK_NE(-1, index); | 1143 DCHECK_NE(-1, index); |
| (...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1733 sync_error_button->SetTooltipText( | 1733 sync_error_button->SetTooltipText( |
| 1734 l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)); | 1734 l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)); |
| 1735 sync_error_button->SetAccessibleName( | 1735 sync_error_button->SetAccessibleName( |
| 1736 l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON)); | 1736 l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON)); |
| 1737 sync_error_button->SetIcon( | 1737 sync_error_button->SetIcon( |
| 1738 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); | 1738 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); |
| 1739 return sync_error_button; | 1739 return sync_error_button; |
| 1740 } | 1740 } |
| 1741 #endif | 1741 #endif |
| 1742 | 1742 |
| OLD | NEW |