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

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

Issue 7054020: Refactors code for showing bookmark menus so that it can be used by (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 node = model_->other_node(); 1067 node = model_->other_node();
1068 } else if (view == overflow_button_) { 1068 } else if (view == overflow_button_) {
1069 node = model_->GetBookmarkBarNode(); 1069 node = model_->GetBookmarkBarNode();
1070 start_index = GetFirstHiddenNodeIndex(); 1070 start_index = GetFirstHiddenNodeIndex();
1071 } else { 1071 } else {
1072 int button_index = GetIndexOf(view); 1072 int button_index = GetIndexOf(view);
1073 DCHECK_NE(-1, button_index); 1073 DCHECK_NE(-1, button_index);
1074 node = model_->GetBookmarkBarNode()->GetChild(button_index); 1074 node = model_->GetBookmarkBarNode()->GetChild(button_index);
1075 } 1075 }
1076 1076
1077 bookmark_menu_ = new BookmarkMenuController(browser_, profile_, 1077 bookmark_menu_ = new BookmarkMenuController(
1078 page_navigator_, GetWindow()->GetNativeWindow(), node, start_index); 1078 profile_, page_navigator_, GetWindow()->GetNativeWindow(), node,
1079 start_index);
1079 bookmark_menu_->set_observer(this); 1080 bookmark_menu_->set_observer(this);
1080 bookmark_menu_->RunMenuAt(this, false); 1081 bookmark_menu_->RunMenuAt(this, false);
1081 } 1082 }
1082 1083
1083 void BookmarkBarView::ButtonPressed(views::Button* sender, 1084 void BookmarkBarView::ButtonPressed(views::Button* sender,
1084 const views::Event& event) { 1085 const views::Event& event) {
1085 // 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.
1086 if (sender->tag() == kSyncErrorButtonTag) { 1087 if (sender->tag() == kSyncErrorButtonTag) {
1087 DCHECK(sender == sync_error_button_); 1088 DCHECK(sender == sync_error_button_);
1088 DCHECK(sync_service_ && !sync_service_->IsManaged()); 1089 DCHECK(sync_service_ && !sync_service_->IsManaged());
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 1380
1380 views::MenuButton* menu_button = GetMenuButtonForNode(node); 1381 views::MenuButton* menu_button = GetMenuButtonForNode(node);
1381 if (!menu_button) 1382 if (!menu_button)
1382 return; 1383 return;
1383 1384
1384 int start_index = 0; 1385 int start_index = 0;
1385 if (node == model_->GetBookmarkBarNode()) 1386 if (node == model_->GetBookmarkBarNode())
1386 start_index = GetFirstHiddenNodeIndex(); 1387 start_index = GetFirstHiddenNodeIndex();
1387 1388
1388 drop_info_->is_menu_showing = true; 1389 drop_info_->is_menu_showing = true;
1389 bookmark_drop_menu_ = new BookmarkMenuController(browser_, profile_, 1390 bookmark_drop_menu_ = new BookmarkMenuController(
1390 page_navigator_, GetWindow()->GetNativeWindow(), node, start_index); 1391 profile_, page_navigator_, GetWindow()->GetNativeWindow(), node,
1392 start_index);
1391 bookmark_drop_menu_->set_observer(this); 1393 bookmark_drop_menu_->set_observer(this);
1392 bookmark_drop_menu_->RunMenuAt(this, true); 1394 bookmark_drop_menu_->RunMenuAt(this, true);
1393 } 1395 }
1394 1396
1395 void BookmarkBarView::StopShowFolderDropMenuTimer() { 1397 void BookmarkBarView::StopShowFolderDropMenuTimer() {
1396 if (show_folder_drop_menu_task_) 1398 if (show_folder_drop_menu_task_)
1397 show_folder_drop_menu_task_->Cancel(); 1399 show_folder_drop_menu_task_->Cancel();
1398 } 1400 }
1399 1401
1400 void BookmarkBarView::StartShowFolderDropMenuTimer(const BookmarkNode* node) { 1402 void BookmarkBarView::StartShowFolderDropMenuTimer(const BookmarkNode* node) {
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1754 prefsize.set_height(kBarHeight + 1756 prefsize.set_height(kBarHeight +
1755 static_cast<int>((kNewtabBarHeight - kBarHeight) * 1757 static_cast<int>((kNewtabBarHeight - kBarHeight) *
1756 (1 - size_animation_->GetCurrentValue()))); 1758 (1 - size_animation_->GetCurrentValue())));
1757 } else { 1759 } else {
1758 prefsize.set_height( 1760 prefsize.set_height(
1759 static_cast<int>(kBarHeight * size_animation_->GetCurrentValue())); 1761 static_cast<int>(kBarHeight * size_animation_->GetCurrentValue()));
1760 } 1762 }
1761 } 1763 }
1762 return prefsize; 1764 return prefsize;
1763 } 1765 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698