This split will facilitate testing DownloadQuery and other users of DownloadItems.

Review URL: http://codereview.chromium.org/8503018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110984 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 10 deletions

diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc
index 7bef1e8..b6f01c0 100644
--- a/chrome/browser/ui/gtk/download/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
@@ -293,7 +293,7 @@ void DownloadItemGtk::OnDownloadUpdated(DownloadItem* download) {
   DCHECK_EQ(download, get_download());
 
   if (dangerous_prompt_ != NULL &&
-      download->safety_state() == DownloadItem::DANGEROUS_BUT_VALIDATED) {
+      download->GetSafetyState() == DownloadItem::DANGEROUS_BUT_VALIDATED) {
     // We have been approved.
     gtk_widget_set_no_show_all(body_.get(), FALSE);
     gtk_widget_set_no_show_all(menu_button_, FALSE);
@@ -315,7 +315,7 @@ void DownloadItemGtk::OnDownloadUpdated(DownloadItem* download) {
     UpdateTooltip();
   }
 
-  switch (download->state()) {
+  switch (download->GetState()) {
     case DownloadItem::REMOVING:
       parent_shelf_->RemoveDownloadItem(this);  // This will delete us!
       return;
@@ -329,9 +329,9 @@ void DownloadItemGtk::OnDownloadUpdated(DownloadItem* download) {
       complete_animation_.Show();
       break;
     case DownloadItem::COMPLETE:
-      // auto_opened() may change after the download's initial transition to
+      // GetAutoOpened() may change after the download's initial transition to
       // COMPLETE, so we check it before the idemopotency shield below.
-      if (download->auto_opened()) {
+      if (download->GetAutoOpened()) {
         parent_shelf_->RemoveDownloadItem(this);  // This will delete us!
         return;
       }
@@ -350,7 +350,7 @@ void DownloadItemGtk::OnDownloadUpdated(DownloadItem* download) {
       download_complete_ = true;
       break;
     case DownloadItem::IN_PROGRESS:
-      get_download()->is_paused() ?
+      get_download()->IsPaused() ?
           StopDownloadProgress() : StartDownloadProgress();
       break;
     default:
@@ -417,7 +417,7 @@ DownloadItem* DownloadItemGtk::get_download() {
 }
 
 bool DownloadItemGtk::IsDangerous() {
-  return get_download()->safety_state() == DownloadItem::DANGEROUS;
+  return get_download()->GetSafetyState() == DownloadItem::DANGEROUS;
 }
 
 // Download progress animation functions.
@@ -573,7 +573,7 @@ void DownloadItemGtk::UpdateDangerWarning() {
             l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION);
       } else {
         string16 elided_filename = ui::ElideFilename(
-            get_download()->target_name(), gfx::Font(), kTextWidth);
+            get_download()->GetTargetName(), gfx::Font(), kTextWidth);
         dangerous_warning =
             l10n_util::GetStringFUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD,
                                        elided_filename);
diff --git a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
index 68e5cfa..cc6901a 100644
--- a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
@@ -219,12 +219,12 @@ void DownloadShelfGtk::Closed() {
                             download->IsCancelled() ||
                             download->IsInterrupted();
     if (is_transfer_done &&
-        download->safety_state() != DownloadItem::DANGEROUS) {
+        download->GetSafetyState() != DownloadItem::DANGEROUS) {
       RemoveDownloadItem(download_items_[i]);
     } else {
       // We set all remaining items as "opened", so that the shelf will auto-
       // close in the future without the user clicking on them.
-      download->set_opened(true);
+      download->SetOpened(true);
       ++i;
     }
   }
@@ -303,7 +303,7 @@ void DownloadShelfGtk::OnButtonClick(GtkWidget* button) {
 void DownloadShelfGtk::AutoCloseIfPossible() {
   for (std::vector<DownloadItemGtk*>::iterator iter = download_items_.begin();
        iter != download_items_.end(); ++iter) {
-    if (!(*iter)->get_download()->opened())
+    if (!(*iter)->get_download()->GetOpened())
       return;
   }