diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 11:34:51 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 11:34:51 +0000 |
| commit | 5ec40cfbe054961db55591c94e46979c4c4d53d7 (patch) | |
| tree | 9412e0b34a4da5569e5d2c5d06edb4885f9a9d3d /chrome/browser/gtk/location_bar_view_gtk.cc | |
| parent | d6d0cf6a3dea6ec00a70781cca4902e133090647 (diff) | |
| download | chromium_src-5ec40cfbe054961db55591c94e46979c4c4d53d7.zip chromium_src-5ec40cfbe054961db55591c94e46979c4c4d53d7.tar.gz chromium_src-5ec40cfbe054961db55591c94e46979c4c4d53d7.tar.bz2 | |
Adds ContentSettingBubbleModel.
Review URL: http://codereview.chromium.org/668075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/location_bar_view_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/location_bar_view_gtk.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index ed0cda4..9e2cb0a 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -20,6 +20,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/command_updater.h" +#include "chrome/browser/content_setting_bubble_model.h" #include "chrome/browser/content_setting_image_model.h" #include "chrome/browser/extensions/extension_accessibility_api_constants.h" #include "chrome/browser/extensions/extension_action_context_menu_model.h" @@ -1016,10 +1017,12 @@ gboolean LocationBarViewGtk::ContentSettingImageViewGtk::OnButtonPressed( GtkWindow* toplevel = GTK_WINDOW(gtk_widget_get_toplevel(sender)); - info_bubble_ = new ContentBlockedBubbleGtk( + info_bubble_ = new ContentSettingBubbleGtk( toplevel, bounds, this, - content_setting_image_model_->get_content_settings_type(), url.host(), - display_host, profile_, tab_contents); + ContentSettingBubbleModel::CreateContentSettingBubbleModel( + tab_contents, profile_, + content_setting_image_model_->get_content_settings_type()), + profile_, tab_contents); return TRUE; } |