Initial Geolocation location bar icons.

chrome/browser/gtk/content_blocked_bubble_gtk.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/gtk/content_blocked_bubble_gtk.h"
 
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "chrome/browser/blocked_popup_container.h"
 #include "chrome/browser/content_setting_bubble_model.h"
@@ skipping 54 matching lines @@
   tab_contents_ = NULL;
 }
 
 void ContentSettingBubbleGtk::BuildBubble() {
   GtkThemeProvider* theme_provider = GtkThemeProvider::GetFrom(profile_);
 
   GtkWidget* bubble_content = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(bubble_content), kContentBorder);
 
   // Add the content label.
-  GtkWidget* label = gtk_label_new(
-      content_setting_bubble_model_->bubble_content().title.c_str());
-  gtk_box_pack_start(GTK_BOX(bubble_content), label, FALSE, FALSE, 0);
+  if (!content_setting_bubble_model_->bubble_content().title.empty()) {
+    GtkWidget* label = gtk_label_new(
+        content_setting_bubble_model_->bubble_content().title.c_str());
+    gtk_box_pack_start(GTK_BOX(bubble_content), label, FALSE, FALSE, 0);
+  }
 
   if (content_setting_bubble_model_->content_type() ==
       CONTENT_SETTINGS_TYPE_POPUPS) {
     const std::vector<ContentSettingBubbleModel::PopupItem>& popup_items =
         content_setting_bubble_model_->bubble_content().popup_items;
     GtkWidget* table = gtk_table_new(popup_items.size(), 2, FALSE);
     int row = 0;
     for (std::vector<ContentSettingBubbleModel::PopupItem>::const_iterator
          i(popup_items.begin()); i != popup_items.end(); ++i, ++row) {
       GtkWidget* image = gtk_image_new();
@@ skipping 26 matching lines @@
 
     gtk_box_pack_start(GTK_BOX(bubble_content), table, FALSE, FALSE, 0);
   }
 
   if (content_setting_bubble_model_->content_type() !=
       CONTENT_SETTINGS_TYPE_COOKIES) {
     const ContentSettingBubbleModel::RadioGroups& radio_groups =
         content_setting_bubble_model_->bubble_content().radio_groups;
     for (ContentSettingBubbleModel::RadioGroups::const_iterator i =
          radio_groups.begin(); i != radio_groups.end(); ++i) {
+      if (!i->title.empty()) {
+        GtkWidget* label = gtk_label_new(i->title.c_str());
+        gtk_box_pack_start(GTK_BOX(bubble_content), label, FALSE, FALSE, 0);
+      }
+
       const ContentSettingBubbleModel::RadioItems& radio_items = i->radio_items;
       RadioGroupGtk radio_group_gtk;
       for (ContentSettingBubbleModel::RadioItems::const_iterator j =
            radio_items.begin(); j != radio_items.end(); ++j) {
         GtkWidget* radio =
             radio_group_gtk.empty() ?
                 gtk_radio_button_new_with_label(NULL, j->c_str()) :
                 gtk_radio_button_new_with_label_from_widget(
                     GTK_RADIO_BUTTON(radio_group_gtk[0]),
                     j->c_str());
@@ skipping 96 matching lines @@
   bubble->Close();
 }
 
 // static
 void ContentSettingBubbleGtk::OnManageLinkClicked(
     GtkButton* button,
     ContentSettingBubbleGtk* bubble) {
   bubble->content_setting_bubble_model_->OnManageLinkClicked();
   bubble->Close();
 }