OLD | NEW |
1 // Copyright (c) 2011 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/ui/gtk/bookmark_bar_gtk.h" | 5 #include "chrome/browser/ui/gtk/bookmark_bar_gtk.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "app/gtk_dnd_util.h" | 9 #include "app/gtk_dnd_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
979 PopupMenuForNode(sender, node, event); | 979 PopupMenuForNode(sender, node, event); |
980 } | 980 } |
981 | 981 |
982 return FALSE; | 982 return FALSE; |
983 } | 983 } |
984 | 984 |
985 gboolean BookmarkBarGtk::OnSyncErrorButtonPressed(GtkWidget* sender, | 985 gboolean BookmarkBarGtk::OnSyncErrorButtonPressed(GtkWidget* sender, |
986 GdkEventButton* event) { | 986 GdkEventButton* event) { |
987 if (sender == sync_error_button_) { | 987 if (sender == sync_error_button_) { |
988 DCHECK(sync_service_ && !sync_service_->IsManaged()); | 988 DCHECK(sync_service_ && !sync_service_->IsManaged()); |
989 sync_service_->ShowLoginDialog(NULL); | 989 sync_service_->ShowErrorUI(NULL); |
990 } | 990 } |
991 | 991 |
992 return FALSE; | 992 return FALSE; |
993 } | 993 } |
994 | 994 |
995 void BookmarkBarGtk::OnClicked(GtkWidget* sender) { | 995 void BookmarkBarGtk::OnClicked(GtkWidget* sender) { |
996 const BookmarkNode* node = GetNodeForToolButton(sender); | 996 const BookmarkNode* node = GetNodeForToolButton(sender); |
997 DCHECK(node); | 997 DCHECK(node); |
998 DCHECK(node->is_url()); | 998 DCHECK(node->is_url()); |
999 DCHECK(page_navigator_); | 999 DCHECK(page_navigator_); |
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1409 | 1409 |
1410 // Find the GtkWidget* for the actual target button. | 1410 // Find the GtkWidget* for the actual target button. |
1411 int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1; | 1411 int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1; |
1412 button_idx = (button_idx + shift + folder_list.size()) % folder_list.size(); | 1412 button_idx = (button_idx + shift + folder_list.size()) % folder_list.size(); |
1413 PopupForButton(folder_list[button_idx]); | 1413 PopupForButton(folder_list[button_idx]); |
1414 } | 1414 } |
1415 | 1415 |
1416 void BookmarkBarGtk::CloseMenu() { | 1416 void BookmarkBarGtk::CloseMenu() { |
1417 current_context_menu_->Cancel(); | 1417 current_context_menu_->Cancel(); |
1418 } | 1418 } |
OLD | NEW |