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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 7057038: dom-ui sync: Eliminate jank when customizing sync settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: comment tweak Created 9 years, 7 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/views/bookmarks/bookmark_bar_view.h" 5 #include "chrome/browser/ui/views/bookmarks/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 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 bookmark_menu_->set_observer(this); 1080 bookmark_menu_->set_observer(this);
1081 bookmark_menu_->RunMenuAt(this, false); 1081 bookmark_menu_->RunMenuAt(this, false);
1082 } 1082 }
1083 1083
1084 void BookmarkBarView::ButtonPressed(views::Button* sender, 1084 void BookmarkBarView::ButtonPressed(views::Button* sender,
1085 const views::Event& event) { 1085 const views::Event& event) {
1086 // Show the login wizard if the user clicked the re-login button. 1086 // Show the login wizard if the user clicked the re-login button.
1087 if (sender->tag() == kSyncErrorButtonTag) { 1087 if (sender->tag() == kSyncErrorButtonTag) {
1088 DCHECK(sender == sync_error_button_); 1088 DCHECK(sender == sync_error_button_);
1089 DCHECK(sync_service_ && !sync_service_->IsManaged()); 1089 DCHECK(sync_service_ && !sync_service_->IsManaged());
1090 sync_service_->ShowErrorUI(); 1090 sync_service_->ShowErrorUI(NULL);
1091 return; 1091 return;
1092 } 1092 }
1093 1093
1094 const BookmarkNode* node; 1094 const BookmarkNode* node;
1095 if (sender->tag() == kOtherFolderButtonTag) { 1095 if (sender->tag() == kOtherFolderButtonTag) {
1096 node = model_->other_node(); 1096 node = model_->other_node();
1097 } else { 1097 } else {
1098 int index = GetIndexOf(sender); 1098 int index = GetIndexOf(sender);
1099 DCHECK_NE(-1, index); 1099 DCHECK_NE(-1, index);
1100 node = model_->GetBookmarkBarNode()->GetChild(index); 1100 node = model_->GetBookmarkBarNode()->GetChild(index);
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
1756 prefsize.set_height(kBarHeight + 1756 prefsize.set_height(kBarHeight +
1757 static_cast<int>((kNewtabBarHeight - kBarHeight) * 1757 static_cast<int>((kNewtabBarHeight - kBarHeight) *
1758 (1 - size_animation_->GetCurrentValue()))); 1758 (1 - size_animation_->GetCurrentValue())));
1759 } else { 1759 } else {
1760 prefsize.set_height( 1760 prefsize.set_height(
1761 static_cast<int>(kBarHeight * size_animation_->GetCurrentValue())); 1761 static_cast<int>(kBarHeight * size_animation_->GetCurrentValue()));
1762 } 1762 }
1763 } 1763 }
1764 return prefsize; 1764 return prefsize;
1765 } 1765 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698