summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/location_bar_view_gtk.h
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 02:46:23 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 02:46:23 +0000
commit962fc382a792cc0085d7ba30aa4f8288a0044cb6 (patch)
treec22450ccf203c89d51d988f2305337f02ffe6804 /chrome/browser/ui/gtk/location_bar_view_gtk.h
parent66d4dab590c5c8bd66d2b62d7b5577b2ae1508d6 (diff)
downloadchromium_src-962fc382a792cc0085d7ba30aa4f8288a0044cb6.zip
chromium_src-962fc382a792cc0085d7ba30aa4f8288a0044cb6.tar.gz
chromium_src-962fc382a792cc0085d7ba30aa4f8288a0044cb6.tar.bz2
bind: More conversions in GTK code.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8068016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/location_bar_view_gtk.h')
-rw-r--r--chrome/browser/ui/gtk/location_bar_view_gtk.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h
index fe169bf..c704972 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h
@@ -15,6 +15,7 @@
#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/extensions/extension_context_menu_model.h"
#include "chrome/browser/extensions/image_loading_tracker.h"
@@ -198,7 +199,7 @@ class LocationBarViewGtk : public AutocompleteEditController,
// The label's default requisition (cached so we can animate accordingly).
GtkRequisition label_req_;
- ScopedRunnableMethodFactory<ContentSettingImageViewGtk> method_factory_;
+ base::WeakPtrFactory<ContentSettingImageViewGtk> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(ContentSettingImageViewGtk);
};
@@ -412,7 +413,7 @@ class LocationBarViewGtk : public AutocompleteEditController,
PageTransition::Type transition_;
// Used to schedule a task for the first run bubble.
- ScopedRunnableMethodFactory<LocationBarViewGtk> first_run_bubble_;
+ base::WeakPtrFactory<LocationBarViewGtk> first_run_bubble_;
// When true, the location bar view is read only and also is has a slightly
// different presentation (font size / color). This is used for popups.