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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
 
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ skipping 35 matching lines @@
     // Notifies that a drag completed.
     virtual void OnToolbarActionViewDragDone() = 0;
 
     // Returns the view of the toolbar actions overflow menu to use as a
     // reference point for a popup when this view isn't visible.
     virtual views::MenuButton* GetOverflowReferenceView() = 0;
 
     // Sets the delegate's active popup owner to be |popup_owner|.
     virtual void SetPopupOwner(ToolbarActionView* popup_owner) = 0;
 
-    // Hides the active popup of the delegate, if one exists.
-    virtual void HideActivePopup() = 0;
-
     // Returns the primary ToolbarActionView associated with the given
     // |extension|.
     virtual ToolbarActionView* GetMainViewForAction(
         ToolbarActionView* view) = 0;
 
    protected:
     ~Delegate() override {}
   };
 
   ToolbarActionView(ToolbarActionViewController* view_controller,
@@ skipping 55 matching lines @@
   void OnPaintBorder(gfx::Canvas* canvas) override;
 
   // ToolbarActionViewDelegateViews:
   views::View* GetAsView() override;
   bool IsShownInMenu() override;
   views::FocusManager* GetFocusManagerForAccelerator() override;
   views::Widget* GetParentForContextMenu() override;
   ToolbarActionViewController* GetPreferredPopupViewController() override;
   views::View* GetReferenceViewForPopup() override;
   views::MenuButton* GetContextMenuButton() override;
-  void HideActivePopup() override;
-  void OnPopupShown(bool grant_tab_permissions) override;
-  void CleanupPopup() override;
+  void OnPopupShown(bool by_user) override;
+  void OnPopupClosed() override;
 
   // A lock to keep the MenuButton pressed when a menu or popup is visible.
   scoped_ptr<views::MenuButton::PressedLock> pressed_lock_;
 
   // The controller for this toolbar action view.
   ToolbarActionViewController* view_controller_;
 
   // The associated browser.
   Browser* browser_;
 
   // Delegate that usually represents a container for ToolbarActionView.
   Delegate* delegate_;
 
   // Used to make sure we only register the command once.
   bool called_register_command_;
 
   // The cached value of whether or not the action wants to run on the current
   // tab.
   bool wants_to_run_;
 
   // A special border to draw when the action wants to run.
   scoped_ptr<views::LabelButtonBorder> wants_to_run_border_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_