diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 20:46:22 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 20:46:22 +0000 |
| commit | 3ed63319d517a373e700fa559b4023b6405b93de (patch) | |
| tree | c8ac542b50fd04c0e67a762ac201f48505bf4d10 | |
| parent | a09b784fff53a779da22cbcf99323dec339de6ac (diff) | |
| download | chromium_src-3ed63319d517a373e700fa559b4023b6405b93de.zip chromium_src-3ed63319d517a373e700fa559b4023b6405b93de.tar.gz chromium_src-3ed63319d517a373e700fa559b4023b6405b93de.tar.bz2 | |
Don't try to show info bubble for prerender icon in GTK.
BUG=73065
TEST=Click on prerender icon on GTK build, nothing happens.
Review URL: http://codereview.chromium.org/6566007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75778 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/gtk/location_bar_view_gtk.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index 465ed67..0157528 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -1316,7 +1316,11 @@ gboolean LocationBarViewGtk::ContentSettingImageViewGtk::OnButtonPressed( GtkWidget* sender, GdkEvent* event) { TabContents* tab_contents = parent_->GetTabContents(); if (!tab_contents) - return true; + return TRUE; + const ContentSettingsType content_settings_type = + content_setting_image_model_->get_content_settings_type(); + if (content_settings_type == CONTENT_SETTINGS_TYPE_PRERENDER) + return TRUE; GURL url = tab_contents->GetURL(); std::wstring display_host; net::AppendFormattedHost(url, @@ -1327,8 +1331,7 @@ gboolean LocationBarViewGtk::ContentSettingImageViewGtk::OnButtonPressed( info_bubble_ = new ContentSettingBubbleGtk( sender, this, ContentSettingBubbleModel::CreateContentSettingBubbleModel( - tab_contents, profile_, - content_setting_image_model_->get_content_settings_type()), + tab_contents, profile_, content_settings_type), profile_, tab_contents); return TRUE; } |