[Extensions Toolbar] Move some popup logic to be platform-agnostic

chrome/browser/ui/views/toolbar/toolbar_action_view.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 
 #include <string>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 263 matching lines @@
 
 views::MenuButton* ToolbarActionView::GetContextMenuButton() {
   DCHECK(visible());  // We should never show a context menu for a hidden item.
   return this;
 }
 
 content::WebContents* ToolbarActionView::GetCurrentWebContents() const {
   return delegate_->GetCurrentWebContents();
 }
 
-void ToolbarActionView::HideActivePopup() {
-  delegate_->HideActivePopup();
-}
-
-void ToolbarActionView::OnPopupShown(bool grant_tab_permissions) {
+void ToolbarActionView::OnPopupShown(bool by_user) {
   delegate_->SetPopupOwner(this);
   // If this was through direct user action, we press the menu button.
-  if (grant_tab_permissions) {
+  if (by_user) {
     // We set the state of the menu button we're using as a reference view,
     // which is either this or the overflow reference view.
     // This cast is safe because GetReferenceViewForPopup returns either |this|
     // or delegate_->GetOverflowReferenceView(), which returns a MenuButton.
     views::MenuButton* reference_view =
         static_cast<views::MenuButton*>(GetReferenceViewForPopup());
     pressed_lock_.reset(new views::MenuButton::PressedLock(reference_view));
   }
 }
 
-void ToolbarActionView::CleanupPopup() {
-  // We need to do these actions synchronously (instead of closing and then
-  // performing the rest of the cleanup in OnWidgetDestroyed()) because
-  // OnWidgetDestroyed() can be called asynchronously from Close(), and we need
-  // to keep the delegate's popup owner up-to-date.
-  delegate_->SetPopupOwner(NULL);
+void ToolbarActionView::OnPopupClosed() {
+  delegate_->SetPopupOwner(nullptr);
   pressed_lock_.reset();  // Unpress the menu button if it was pressed.
 }