Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Side by Side Diff: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc

Issue 7093004: Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes and cleanups. Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/bookmarks/bookmark_bar_gtk.h" 5 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1018 PopupMenuForNode(sender, node, event); 1018 PopupMenuForNode(sender, node, event);
1019 } 1019 }
1020 1020
1021 return FALSE; 1021 return FALSE;
1022 } 1022 }
1023 1023
1024 gboolean BookmarkBarGtk::OnSyncErrorButtonPressed(GtkWidget* sender, 1024 gboolean BookmarkBarGtk::OnSyncErrorButtonPressed(GtkWidget* sender,
1025 GdkEventButton* event) { 1025 GdkEventButton* event) {
1026 if (sender == sync_error_button_) { 1026 if (sender == sync_error_button_) {
1027 DCHECK(sync_service_ && !sync_service_->IsManaged()); 1027 DCHECK(sync_service_ && !sync_service_->IsManaged());
1028 sync_service_->ShowErrorUI(NULL); 1028 sync_service_->ShowErrorUI();
1029 } 1029 }
1030 1030
1031 return FALSE; 1031 return FALSE;
1032 } 1032 }
1033 1033
1034 void BookmarkBarGtk::OnClicked(GtkWidget* sender) { 1034 void BookmarkBarGtk::OnClicked(GtkWidget* sender) {
1035 const BookmarkNode* node = GetNodeForToolButton(sender); 1035 const BookmarkNode* node = GetNodeForToolButton(sender);
1036 DCHECK(node); 1036 DCHECK(node);
1037 DCHECK(node->is_url()); 1037 DCHECK(node->is_url());
1038 DCHECK(page_navigator_); 1038 DCHECK(page_navigator_);
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 1466
1467 // Find the GtkWidget* for the actual target button. 1467 // Find the GtkWidget* for the actual target button.
1468 int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1; 1468 int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1;
1469 button_idx = (button_idx + shift + folder_list.size()) % folder_list.size(); 1469 button_idx = (button_idx + shift + folder_list.size()) % folder_list.size();
1470 PopupForButton(folder_list[button_idx]); 1470 PopupForButton(folder_list[button_idx]);
1471 } 1471 }
1472 1472
1473 void BookmarkBarGtk::CloseMenu() { 1473 void BookmarkBarGtk::CloseMenu() {
1474 current_context_menu_->Cancel(); 1474 current_context_menu_->Cancel();
1475 } 1475 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698