diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:29:03 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:29:03 +0000 |
| commit | a955860ece843c2a7c9f628ab1a9fda85e96964d (patch) | |
| tree | e9c86e6f5e7c56a7ba24f58ea0e34729ae311b6e /chrome/browser/gtk | |
| parent | acb9f727a429993ae23f1cc104c0c7889af58315 (diff) | |
| download | chromium_src-a955860ece843c2a7c9f628ab1a9fda85e96964d.zip chromium_src-a955860ece843c2a7c9f628ab1a9fda85e96964d.tar.gz chromium_src-a955860ece843c2a7c9f628ab1a9fda85e96964d.tar.bz2 | |
Finish wiring up notifications in extensions.
Review URL: http://codereview.chromium.org/1076004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/notifications/balloon_view_gtk.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/gtk/notifications/balloon_view_gtk.h | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/notifications/balloon_view_host_gtk.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/gtk/notifications/balloon_view_gtk.cc index a3a53dd..5fb3910 100644 --- a/chrome/browser/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/gtk/notifications/balloon_view_gtk.cc @@ -87,7 +87,6 @@ BalloonViewImpl::BalloonViewImpl(BalloonCollection* collection) : balloon_(NULL), frame_container_(NULL), html_container_(NULL), - html_contents_(NULL), method_factory_(this), close_button_(NULL), animation_(NULL) { @@ -234,7 +233,7 @@ void BalloonViewImpl::Show(Balloon* balloon) { options_menu_.reset(new MenuGtk(this, options_menu_model_.get())); // Create a BalloonViewHost to host the HTML contents of this balloon. - html_contents_ = new BalloonViewHost(balloon); + html_contents_.reset(new BalloonViewHost(balloon)); html_contents_->Init(); gfx::NativeView contents = html_contents_->native_view(); diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.h b/chrome/browser/gtk/notifications/balloon_view_gtk.h index 69bd696..eeeafa7 100644 --- a/chrome/browser/gtk/notifications/balloon_view_gtk.h +++ b/chrome/browser/gtk/notifications/balloon_view_gtk.h @@ -126,8 +126,8 @@ class BalloonViewImpl : public BalloonView, // The window that contains the contents of the notification. GtkWidget* html_container_; - // The renderer of the HTML contents. Pointer owned by the views hierarchy. - BalloonViewHost* html_contents_; + // The renderer of the HTML contents. + scoped_ptr<BalloonViewHost> html_contents_; // The following factory is used to call methods at a later time. ScopedRunnableMethodFactory<BalloonViewImpl> method_factory_; diff --git a/chrome/browser/gtk/notifications/balloon_view_host_gtk.h b/chrome/browser/gtk/notifications/balloon_view_host_gtk.h index 833a78c..f51b875 100644 --- a/chrome/browser/gtk/notifications/balloon_view_host_gtk.h +++ b/chrome/browser/gtk/notifications/balloon_view_host_gtk.h @@ -19,7 +19,7 @@ class BalloonViewHost : public BalloonHost { explicit BalloonViewHost(Balloon* balloon); ~BalloonViewHost() { - Shutdown(); + Shutdown(); } // Changes the size of the balloon. |