Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions.

chrome/browser/ui/gtk/location_bar_view_gtk.h

 // Copyright (c) 2011 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>
 
@@ skipping 139 matching lines @@
    public:
     ContentSettingImageViewGtk(ContentSettingsType content_type,
                                const LocationBarViewGtk* parent,
                                Profile* profile);
     virtual ~ContentSettingImageViewGtk();
 
     GtkWidget* widget() { return alignment_.get(); }
 
     void set_profile(Profile* profile) { profile_ = profile; }
 
-    bool IsVisible();
+    bool IsVisible() { return GTK_WIDGET_VISIBLE(widget()); }
     void UpdateFromTabContents(TabContents* tab_contents);
 
     // Overridden from ui::AnimationDelegate:
     virtual void AnimationProgressed(const ui::Animation* animation);
     virtual void AnimationEnded(const ui::Animation* animation);
     virtual void AnimationCanceled(const ui::Animation* animation);
 
    private:
     // Start the process of showing the label.
     void StartAnimating();
@@ skipping 50 matching lines @@
     virtual ~PageActionViewGtk();
 
     GtkWidget* widget() { return event_box_.get(); }
 
     ExtensionAction* page_action() { return page_action_; }
 
     void set_preview_enabled(bool preview_enabled) {
       preview_enabled_ = preview_enabled;
     }
 
-    bool IsVisible();
+    bool IsVisible() { return GTK_WIDGET_VISIBLE(widget()); }
 
     // 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);
 
     // A callback from ImageLoadingTracker for when the image has loaded.
     virtual void OnImageLoaded(
         SkBitmap* image, const ExtensionResource& resource, int index);
 
@@ skipping 212 matching lines @@
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_