OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser_actions_container.h" | 5 #include "chrome/browser/ui/views/browser_actions_container.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 void BrowserActionsContainer::CloseOverflowMenu() { | 710 void BrowserActionsContainer::CloseOverflowMenu() { |
711 if (overflow_menu_) | 711 if (overflow_menu_) |
712 overflow_menu_->CancelMenu(); | 712 overflow_menu_->CancelMenu(); |
713 } | 713 } |
714 | 714 |
715 void BrowserActionsContainer::StopShowFolderDropMenuTimer() { | 715 void BrowserActionsContainer::StopShowFolderDropMenuTimer() { |
716 show_menu_task_factory_.InvalidateWeakPtrs(); | 716 show_menu_task_factory_.InvalidateWeakPtrs(); |
717 } | 717 } |
718 | 718 |
719 void BrowserActionsContainer::StartShowFolderDropMenuTimer() { | 719 void BrowserActionsContainer::StartShowFolderDropMenuTimer() { |
720 MessageLoop::current()->PostDelayedTask( | 720 base::MessageLoop::current()->PostDelayedTask( |
721 FROM_HERE, | 721 FROM_HERE, |
722 base::Bind(&BrowserActionsContainer::ShowDropFolder, | 722 base::Bind(&BrowserActionsContainer::ShowDropFolder, |
723 show_menu_task_factory_.GetWeakPtr()), | 723 show_menu_task_factory_.GetWeakPtr()), |
724 base::TimeDelta::FromMilliseconds(views::GetMenuShowDelay())); | 724 base::TimeDelta::FromMilliseconds(views::GetMenuShowDelay())); |
725 } | 725 } |
726 | 726 |
727 void BrowserActionsContainer::ShowDropFolder() { | 727 void BrowserActionsContainer::ShowDropFolder() { |
728 DCHECK(!overflow_menu_); | 728 DCHECK(!overflow_menu_); |
729 SetDropIndicator(-1); | 729 SetDropIndicator(-1); |
730 overflow_menu_ = new BrowserActionOverflowMenuController( | 730 overflow_menu_ = new BrowserActionOverflowMenuController( |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
839 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT; | 839 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT; |
840 popup_ = ExtensionPopup::ShowPopup(popup_url, | 840 popup_ = ExtensionPopup::ShowPopup(popup_url, |
841 browser_, | 841 browser_, |
842 reference_view, | 842 reference_view, |
843 arrow, | 843 arrow, |
844 show_action); | 844 show_action); |
845 popup_->GetWidget()->AddObserver(this); | 845 popup_->GetWidget()->AddObserver(this); |
846 popup_button_ = button; | 846 popup_button_ = button; |
847 popup_button_->SetButtonPushed(); | 847 popup_button_->SetButtonPushed(); |
848 } | 848 } |
OLD | NEW |