Revert half of the changes from 137638 that are probably causing breakages in

chrome/browser/ui/gtk/location_bar_view_gtk.h

 // Copyright (c) 2012 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_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include <map>
-#include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/browser/extensions/action_box_controller.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/common/content_settings_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_transition_types.h"
@@ skipping 40 matching lines @@
   GtkWidget* location_icon_widget() const { return location_icon_image_; }
 
   // Returns the widget the extension installed bubble should point to.
   GtkWidget* location_entry_widget() const { return entry_box_; }
 
   Browser* browser() const { return browser_; }
 
   // Returns the current WebContents.
   content::WebContents* GetWebContents() const;
 
-  // If |preview_enabled| is true, the view will display the
+  // Sets |preview_enabled| for the PageActionViewGtk associated with this
+  // |page_action|. If |preview_enabled| is true, the view will display the
+  // page action's icon even though it has not been activated by the extension.
   // This is used by the ExtensionInstalledBubbleGtk to preview what the icon
-  // page action's icon even though it has not been activated by the extension.
   // will look like for the user upon installation of the extension.
   void SetPreviewEnabledPageAction(ExtensionAction *page_action,
                                    bool preview_enabled);
 
   // Retrieves the GtkWidget which is associated with PageActionView
   // corresponding to |page_action|.
   GtkWidget* GetPageActionWidget(ExtensionAction* page_action);
 
   // Updates the location bar.  We also reset the bar's permanent text and
   // security style, and, if |tab_for_state_restoring| is non-NULL, also
@@ skipping 126 matching lines @@
   class PageActionViewGtk : public ImageLoadingTracker::Observer,
                             public content::NotificationObserver {
    public:
     PageActionViewGtk(LocationBarViewGtk* owner, ExtensionAction* page_action);
     virtual ~PageActionViewGtk();
 
     GtkWidget* widget() { return event_box_.get(); }
 
     ExtensionAction* page_action() { return page_action_; }
 
-    // Called to notify the PageAction that it should update based on the state
-    // of |page_action_|. |contents| is the WebContents that is active, |url|
+    void set_preview_enabled(bool preview_enabled) {
+      preview_enabled_ = preview_enabled;
+    }
+
+    bool IsVisible();
+
+    // Called to notify the PageAction that it should determine whether to be
+    // visible or hidden. |contents| is the WebContents that is active, |url|
     // is the current page URL.
-    void Update(content::WebContents* contents, const GURL& url);
+    void UpdateVisibility(content::WebContents* contents, const GURL& url);
 
     // A callback from ImageLoadingTracker for when the image has loaded.
     virtual void OnImageLoaded(const gfx::Image& image,
                                const std::string& extension_id,
                                int index) OVERRIDE;
 
     // Simulate left mouse click on the page action button.
     void TestActivatePageAction();
 
     // Implement the content::NotificationObserver interface.
@@ skipping 58 matching lines @@
 
     // The Notification registrar.
     content::NotificationRegistrar registrar_;
 
     // The accelerator group used to handle accelerators, owned by this object.
     GtkAccelGroup* accel_group_;
 
     // The keybinding accelerator registered to show the page action popup.
     scoped_ptr<ui::AcceleratorGtk> keybinding_;
 
+    // This is used for post-install visual feedback. The page_action icon
+    // is briefly shown even if it hasn't been enabled by its extension.
+    bool preview_enabled_;
+
     // The context menu view and model for this extension action.
     scoped_ptr<MenuGtk> context_menu_;
     scoped_refptr<ExtensionContextMenuModel> context_menu_model_;
 
     DISALLOW_COPY_AND_ASSIGN(PageActionViewGtk);
   };
   friend class PageActionViewGtk;
 
   // Creates, initializes, and packs the location icon, EV certificate name,
   // and optional border.
@@ skipping 153 matching lines @@
 
   // Indicate if |tab_to_search_hint_| should be shown.
   bool show_keyword_hint_;
 
   // The last search keyword that was shown via the |tab_to_search_box_|.
   string16 last_keyword_;
 
   // Used to change the visibility of the star decoration.
   BooleanPrefMember edit_bookmarks_enabled_;
 
-  // The extension actions which have "preview enabled".
-  std::set<ExtensionAction*> preview_enabled_actions_;
-
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_