Downloads bar for MD: work on sizing, text appearance.

chrome/browser/ui/views/download/download_item_view_md.h

 // Copyright 2015 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.
 //
 // A view that implements one download on the Download shelf.
 // Each DownloadItemViewMd contains an application icon, a text label
 // indicating the download's file name, a text label indicating the
 // download's status (such as the number of bytes downloaded so far)
 // and a button for canceling an in progress download, or opening
 // the completed download.
@@ skipping 107 matching lines @@
 
  private:
   enum State { NORMAL = 0, HOT, PUSHED };
 
   enum Mode {
     NORMAL_MODE = 0,  // Showing download item.
     DANGEROUS_MODE,   // Displaying the dangerous download warning.
     MALICIOUS_MODE    // Displaying the malicious download warning.
   };
 
-  // The image set associated with the part containing the icon and text.
-  // TODO(estade): these are not drawn, they're just used for vestigial sizing
-  // logic. Remove them.
-  struct BodyImageSet {
-    gfx::ImageSkia* top_left;
-    gfx::ImageSkia* left;
-    gfx::ImageSkia* bottom_left;
-    gfx::ImageSkia* top;
-    gfx::ImageSkia* center;
-    gfx::ImageSkia* bottom;
-    gfx::ImageSkia* top_right;
-    gfx::ImageSkia* right;
-    gfx::ImageSkia* bottom_right;
-  };
-
-  // The image set associated with the drop-down button on the right.
-  struct DropdownImageSet {
-    gfx::ImageSkia* top;
-    gfx::ImageSkia* center;
-    gfx::ImageSkia* bottom;
-  };
-
   void OpenDownload();
 
   // Submits the downloaded file to the safebrowsing download feedback service.
   // Returns whether submission was successful. On successful submission,
   // |this| and the DownloadItem will have been deleted.
   bool SubmitDownloadToFeedbackService();
 
   // If the user has |enabled| uploading, calls SubmitDownloadToFeedbackService.
   // Otherwise, it simply removes the DownloadItem without uploading.
   void PossiblySubmitDownloadToFeedbackService(bool enabled);
 
+  // This function calculates the vertical coordinate to draw the file name text
+  // relative to local bounds.
+  int GetYForFilenameText() const;
+
   // Painting of various download item bits.
   void DrawStatusText(gfx::Canvas* canvas);
   void DrawFilename(gfx::Canvas* canvas);
   void DrawIcon(gfx::Canvas* canvas);
 
   void LoadIcon();
   void LoadIconIfItemPathChanged();
 
   // Update the button colors based on the current theme.
   void UpdateColorsFromTheme();
@@ skipping 42 matching lines @@
   // so that screenreaders can access the filename, status text, and
   // dangerous download warning message (if any).
   void UpdateAccessibleName();
 
   // Show/Hide/Reset |animation| based on the state transition specified by
   // |from| and |to|.
   void AnimateStateTransition(State from,
                               State to,
                               gfx::SlideAnimation* animation);
 
-  // The different images used for the background.
-  BodyImageSet normal_body_image_set_;
-  BodyImageSet hot_body_image_set_;
-  BodyImageSet pushed_body_image_set_;
-  BodyImageSet dangerous_mode_body_image_set_;
-  BodyImageSet malicious_mode_body_image_set_;
-  DropdownImageSet normal_dropdown_image_set_;
-  DropdownImageSet hot_dropdown_image_set_;
-  DropdownImageSet pushed_dropdown_image_set_;
-
   // The warning icon showns for dangerous downloads.
   const gfx::ImageSkia* warning_icon_;
 
   // The download shelf that owns us.
   DownloadShelfView* shelf_;
 
   // Elements of our particular download
   base::string16 status_text_;
 
-  // The font list used to print the file name and status.
+  // The font list used to print the file name and warning text.
   gfx::FontList font_list_;
 
+  // The font list used to print the status text below the file name.
+  gfx::FontList status_font_list_;
+
   // The tooltip.  Only displayed when not showing a warning dialog.
   base::string16 tooltip_text_;
 
   // The current state (normal, hot or pushed) of the body and drop-down.
   State dropdown_state_;
 
   // Mode of the download item view.
   Mode mode_;
 
   // When download progress last began animating (pausing and resuming will
   // update this). Used for downloads of unknown size.
   base::TimeTicks progress_start_time_;
 
   // Keeps the amount of time spent already animating. Used to keep track of
   // total active time for downloads of unknown size.
   base::TimeDelta previous_progress_elapsed_;
 
-  // The height of the box formed by the background images and its labels.
-  int box_height_;
-
-  // The y coordinate of the box formed by the background images and its labels.
-  int box_y_;
-
   // Whether we are dragging the download button.
   bool dragging_;
 
   // Whether we are tracking a possible drag.
   bool starting_drag_;
 
   // Position that a possible drag started at.
   gfx::Point drag_start_point_;
 
   // For canceling an in progress icon request.
@@ skipping 53 matching lines @@
   scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
 
   // Method factory used to delay reenabling of the item when opening the
   // downloaded file.
   base::WeakPtrFactory<DownloadItemViewMd> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemViewMd);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_ITEM_VIEW_MD_H_