Merge 32277 - Fix a crash when activating a select element inside a page...

chrome/browser/views/location_bar_view.h

 // Copyright (c) 2009 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_VIEWS_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <map>
 #include <vector>
 
 #include "app/gfx/font.h"
 #include "base/gfx/rect.h"
+#include "base/task.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
+#include "chrome/browser/views/browser_bubble.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/painter.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 #else
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
 #endif
 
 class BubblePositioner;
 class CommandUpdater;
 class ExtensionAction;
+class ExtensionPopup;
 class GURL;
 class Profile;
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // LocationBarView class
 //
 //   The LocationBarView class is a View subclass that paints the background
 //   of the URL bar strip and contains its content.
 //
@@ skipping 308 matching lines @@
     Profile* profile_;
 
     ToolbarModel* model_;
 
     DISALLOW_COPY_AND_ASSIGN(SecurityImageView);
   };
 
   // PageActionImageView is used to display the icon for a given PageAction
   // and notify the extension when the icon is clicked.
   class PageActionImageView : public LocationBarImageView,
-                              public ImageLoadingTracker::Observer {
+                              public ImageLoadingTracker::Observer,
+                              public BrowserBubble::Delegate {
    public:
     PageActionImageView(LocationBarView* owner,
                         Profile* profile,
                         ExtensionAction* page_action,
                         const BubblePositioner* bubble_positioner);
     virtual ~PageActionImageView();
 
     ExtensionAction* page_action() { return page_action_; }
 
     int current_tab_id() { return current_tab_id_; }
 
     void set_preview_enabled(bool preview_enabled) {
       preview_enabled_ = preview_enabled;
     }
 
     // Overridden from view.
     virtual void OnMouseMoved(const views::MouseEvent& event);
     virtual bool OnMousePressed(const views::MouseEvent& event);
 
     // Overridden from LocationBarImageView.
     virtual void ShowInfoBubble();
 
     // Overridden from ImageLoadingTracker.
     virtual void OnImageLoaded(SkBitmap* image, size_t index);
 
+    // Overridden from BrowserBubble::Delegate
+    virtual void BubbleBrowserWindowClosing(BrowserBubble* bubble);
+    virtual void BubbleLostFocus(BrowserBubble* bubble);
+
     // Called to notify the PageAction that it should determine whether to be
     // visible or hidden. |contents| is the TabContents that is active, |url|
     // is the current page URL.
     void UpdateVisibility(TabContents* contents, const GURL& url);
 
     // Either notify listners or show a popup depending on the page action.
     void ExecuteAction(int button);
 
    private:
+    // Hides the active popup, if there is one.
+    void HidePopup();
+
     // The location bar view that owns us.
     LocationBarView* owner_;
 
     // The current profile (not owned by us).
     Profile* profile_;
 
     // The PageAction that this view represents. The PageAction is not owned by
     // us, it resides in the extension of this particular profile.
     ExtensionAction* page_action_;
 
@@ skipping 11 matching lines @@
     // The URL we are currently showing the icon for.
     GURL current_url_;
 
     // The string to show for a tooltip;
     std::string tooltip_;
 
     // This is used for post-install visual feedback. The page_action icon
     // is briefly shown even if it hasn't been enabled by it's extension.
     bool preview_enabled_;
 
+    // The current popup and the button it came from.  NULL if no popup.
+    ExtensionPopup* popup_;
+
+    ScopedRunnableMethodFactory<PageActionImageView> method_factory_;
+
     DISALLOW_COPY_AND_ASSIGN(PageActionImageView);
   };
   friend class PageActionImageView;
 
   class PageActionWithBadgeView;
   friend class PageActionWithBadgeView;
   // Both Layout and OnChanged call into this. This updates the contents
   // of the 3 views: selected_keyword, keyword_hint and type_search_view. If
   // force_layout is true, or one of these views has changed in such a way as
   // to necessitate a layout, layout occurs as well.
@@ skipping 126 matching lines @@
   // The positioner that places the omnibox and info bubbles.
   const BubblePositioner* bubble_positioner_;
 
   // Storage of string needed for accessibility.
   std::wstring accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_