Detect removed files and reflect the state in chrome://downloads and the download shelf

chrome/browser/ui/gtk/download/download_item_gtk.cc

 // Copyright (c) 2011 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/ui/gtk/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 181 matching lines @@
                    G_CALLBACK(OnButtonPressThunk), this);
   GTK_WIDGET_UNSET_FLAGS(body_.get(), GTK_CAN_FOCUS);
   // Remove internal padding on the button.
   GtkRcStyle* no_padding_style = gtk_rc_style_new();
   no_padding_style->xthickness = 0;
   no_padding_style->ythickness = 0;
   gtk_widget_modify_style(body_.get(), no_padding_style);
   g_object_unref(no_padding_style);
 
   name_label_ = gtk_label_new(NULL);
+  // Left align and vertically center the labels.
+  gtk_misc_set_alignment(GTK_MISC(name_label_), 0, 0.5);
+  // Until we switch to vector graphics, force the font size.
+  gtk_util::ForceFontSizePixels(name_label_, kTextSize);
 
   UpdateNameLabel();
 
-  status_label_ = gtk_label_new(NULL);
-  g_signal_connect(status_label_, "destroy",
-                   G_CALLBACK(gtk_widget_destroyed), &status_label_);
-  // Left align and vertically center the labels.
-  gtk_misc_set_alignment(GTK_MISC(name_label_), 0, 0.5);
-  gtk_misc_set_alignment(GTK_MISC(status_label_), 0, 0.5);
-  // Until we switch to vector graphics, force the font size.
-  gtk_util::ForceFontSizePixels(name_label_, kTextSize);
-  gtk_util::ForceFontSizePixels(status_label_, kTextSize);
+  status_label_ = NULL;
 
   // Stack the labels on top of one another.
-  GtkWidget* text_stack = gtk_vbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(text_stack), name_label_, TRUE, TRUE, 0);
-  gtk_box_pack_start(GTK_BOX(text_stack), status_label_, FALSE, FALSE, 0);
+  text_stack_ = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(text_stack_), name_label_, TRUE, TRUE, 0);
 
   // We use a GtkFixed because we don't want it to have its own window.
   // This choice of widget is not critically important though.
   progress_area_.Own(gtk_fixed_new());
   gtk_widget_set_size_request(progress_area_.get(),
       download_util::kSmallProgressIconSize,
       download_util::kSmallProgressIconSize);
   gtk_widget_set_app_paintable(progress_area_.get(), TRUE);
   g_signal_connect(progress_area_.get(), "expose-event",
                    G_CALLBACK(OnProgressAreaExposeThunk), this);
 
   // Put the download progress icon on the left of the labels.
   GtkWidget* body_hbox = gtk_hbox_new(FALSE, 0);
   gtk_container_add(GTK_CONTAINER(body_.get()), body_hbox);
   gtk_box_pack_start(GTK_BOX(body_hbox), progress_area_.get(), FALSE, FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(body_hbox), text_stack, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(body_hbox), text_stack_, TRUE, TRUE, 0);
 
   menu_button_ = gtk_button_new();
   gtk_widget_set_app_paintable(menu_button_, TRUE);
   GTK_WIDGET_UNSET_FLAGS(menu_button_, GTK_CAN_FOCUS);
   g_signal_connect(menu_button_, "expose-event",
                    G_CALLBACK(OnExposeThunk), this);
   g_signal_connect(menu_button_, "button-press-event",
                    G_CALLBACK(OnMenuButtonPressEventThunk), this);
   g_object_set_data(G_OBJECT(menu_button_), "left-align-popup",
                     reinterpret_cast<void*>(true));
@@ skipping 167 matching lines @@
       download_complete_ = true;
       break;
     case DownloadItem::IN_PROGRESS:
       get_download()->is_paused() ?
           StopDownloadProgress() : StartDownloadProgress();
       break;
     default:
       NOTREACHED();
   }
 
-  // Now update the status label. We may have already removed it; if so, we
-  // do nothing.
-  if (!status_label_) {
-    return;
-  }
-
   status_text_ = UTF16ToUTF8(download_model_->GetStatusText());
-  // Remove the status text label.
-  if (status_text_.empty()) {
-    gtk_widget_destroy(status_label_);
-    return;
-  }
-
   UpdateStatusLabel(status_text_);
 }
 
 void DownloadItemGtk::AnimationProgressed(const ui::Animation* animation) {
   if (animation == &complete_animation_) {
     gtk_widget_queue_draw(progress_area_.get());
   } else {
     DCHECK(animation == new_item_animation_.get());
     if (IsDangerous()) {
       int progress = static_cast<int>((dangerous_hbox_full_width_ -
@@ skipping 116 matching lines @@
   GdkColor color = theme_service_->GetGdkColor(
       ThemeService::COLOR_BOOKMARK_TEXT);
   gtk_util::SetLabelColor(
       name_label_,
       theme_service_->UsingNativeTheme() ? NULL : &color);
   gtk_label_set_text(GTK_LABEL(name_label_),
                      UTF16ToUTF8(elided_filename).c_str());
 }
 
 void DownloadItemGtk::UpdateStatusLabel(const std::string& status_text) {
-  if (!status_label_)
+  // If |status_text| is empty, only |name_label_| is displayed at the
+  // vertical center of |text_stack_|. Otherwise, |name_label_| is displayed
+  // on the upper half of |text_stack_| and |status_label_| is displayed
+  // on the lower half of |text_stack_|.
+  if (status_text.empty() && status_label_) {
+    gtk_widget_destroy(status_label_);
     return;
+  }
+  if (!status_label_) {
+    status_label_ = gtk_label_new(NULL);
+    g_signal_connect(status_label_, "destroy",
+                     G_CALLBACK(gtk_widget_destroyed), &status_label_);
+    // Left align and vertically center the labels.
+    gtk_misc_set_alignment(GTK_MISC(status_label_), 0, 0.5);
+    // Until we switch to vector graphics, force the font size.
+    gtk_util::ForceFontSizePixels(status_label_, kTextSize);
+
+    gtk_box_pack_start(GTK_BOX(text_stack_), status_label_, FALSE, FALSE, 0);
+    gtk_widget_show_all(hbox_.get());
+  }
 
   GdkColor text_color;
   if (!theme_service_->UsingNativeTheme()) {
     SkColor color = theme_service_->GetColor(
         ThemeService::COLOR_BOOKMARK_TEXT);
     if (color_utils::RelativeLuminance(color) > 0.5) {
       color = SkColorSetRGB(
           static_cast<int>(kDownloadItemLuminanceMod *
                            SkColorGetR(color)),
           static_cast<int>(kDownloadItemLuminanceMod *
@@ skipping 256 matching lines @@
     gtk_container_propagate_expose(GTK_CONTAINER(widget), child, e);
 
   return TRUE;
 }
 
 void DownloadItemGtk::OnClick(GtkWidget* widget) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
                            base::Time::Now() - creation_time_);
   get_download()->OpenDownload();
   parent_shelf_->ItemOpened();
+  parent_shelf_->CheckForFilesRemoval();

[Randy Smith (Not in Mondays), 2011/05/13 20:45:32]

As mentioned elsewhere, I don't think this belongs here.  It's both not core
download code, and it's much more frequently than I think we want to be throwing
a whole lot of probe messages around for a rare occurence.

[haraken1, 2011/05/16 11:42:27]

I removed it.

 }
 
 gboolean DownloadItemGtk::OnButtonPress(GtkWidget* button,
                                         GdkEventButton* event) {
   if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
     ShowPopupMenu(NULL, event);
+    parent_shelf_->CheckForFilesRemoval();
     return TRUE;
   }
-
+  parent_shelf_->CheckForFilesRemoval();
   return FALSE;
 }
 
 gboolean DownloadItemGtk::OnProgressAreaExpose(GtkWidget* widget,
                                                GdkEventExpose* event) {
   // Create a transparent canvas.
   gfx::CanvasSkiaPaint canvas(event, false);
   if (complete_animation_.is_animating()) {
     if (get_download()->IsInterrupted()) {
       download_util::PaintDownloadInterrupted(&canvas,
@@ skipping 25 matching lines @@
 
   return TRUE;
 }
 
 gboolean DownloadItemGtk::OnMenuButtonPressEvent(GtkWidget* button,
                                                  GdkEventButton* event) {
   if (event->type == GDK_BUTTON_PRESS && event->button == 1) {
     ShowPopupMenu(button, event);
     menu_showing_ = true;
     gtk_widget_queue_draw(button);
+    parent_shelf_->CheckForFilesRemoval();
     return TRUE;
   }
-
+  parent_shelf_->CheckForFilesRemoval();
   return FALSE;
 }
 
 void DownloadItemGtk::ShowPopupMenu(GtkWidget* button,
                                     GdkEventButton* event) {
   // Stop any completion animation.
   if (complete_animation_.is_animating())
     complete_animation_.End();
 
   if (!menu_.get())
@@ skipping 16 matching lines @@
   get_download()->DangerousDownloadValidated();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   if (get_download()->IsPartialDownload())
     get_download()->Cancel(true);
   get_download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
 }