History View CRect to gfx Cleanup

chrome/browser/history_view.cc

 // Copyright (c) 2006-2008 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/history_view.h"
 
 #include "base/string_util.h"
 #include "base/time_format.h"
 #include "base/word_iterator.h"
 #include "chrome/browser/browsing_data_remover.h"
@@ skipping 257 matching lines @@
   static const int kThumbnailHeight = kSearchResultsHeight - kEntryPadding * 2;
 
   // The width of the thumbnail images.
   static const int kThumbnailWidth = static_cast<int>(1.44 * kThumbnailHeight);
 
   // The maximum width of a snippet - we want to constrain this to make
   // snippets easier to read (like Google search results).
   static const int kMaxSnippetWidth = 500;
 
   // Returns the bounds of the thumbnail.
-  void GetThumbnailBounds(CRect* rect);
+  void GetThumbnailBounds(gfx::Rect* rect);
 
   // Convert a GURL into a displayable string.
   std::wstring DisplayURL(const GURL& url);
 
   virtual void Paint(ChromeCanvas* canvas);
 
   // Notification that the star was changed.
   virtual void StarStateChanged(bool state);
 
   // Notification that the link was clicked.
@@ skipping 48 matching lines @@
   time_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(time_label_);
 
   snippet_label_ = new SnippetRenderer();
   AddChildView(snippet_label_);
 }
 
 HistoryItemRenderer::~HistoryItemRenderer() {
 }
 
-void HistoryItemRenderer::GetThumbnailBounds(CRect* rect) {
+void HistoryItemRenderer::GetThumbnailBounds(gfx::Rect* rect) {
   DCHECK(rect);
-  rect->right = width() - kEntryPadding;
-  rect->left = rect->right - kThumbnailWidth;
-  rect->top = kEntryPadding;
-  rect->bottom = rect->top + kThumbnailHeight;
+  rect->set_x(width() - kEntryPadding - kThumbnailWidth);
+  rect->set_y(kEntryPadding);
+  rect->set_width(kThumbnailWidth);
+  rect->set_height(kThumbnailHeight);
 }
 
 std::wstring HistoryItemRenderer::DisplayURL(const GURL& url) {
   std::string url_str = url.spec();
   // Hide the "http://" prefix like web search does.
   if (url_str.find("http://") == 0)
     url_str.erase(0, strlen("http://"));
   return UTF8ToWide(url_str);
 }
 
 void HistoryItemRenderer::Paint(ChromeCanvas* canvas) {
   views::View::Paint(canvas);
 
   // Draw thumbnail or placeholder.
   if (show_full_) {
     SkBitmap* thumbnail = model_->GetThumbnail(model_index_);
-    CRect thumbnail_rect;
+    gfx::Rect thumbnail_rect;
     GetThumbnailBounds(&thumbnail_rect);  // Includes border
 
     // If the UI layout is right-to-left, we must mirror the bounds so that we
     // render the bitmap in the correct position.
-    gfx::Rect mirrored_rect(thumbnail_rect);
-    thumbnail_rect.MoveToX(MirroredLeftPointForRect(mirrored_rect));
+    thumbnail_rect.set_x(MirroredLeftPointForRect(thumbnail_rect));
 
     if (thumbnail) {
       // This will create a MipMap for the bitmap if one doesn't exist already
       // (it's a NOP if a MipMap already exists). This will give much smoother
       // results for the scaled-down thumbnails.
       thumbnail->buildMipMap(false);
 
       canvas->DrawBitmapInt(
           *thumbnail,
           0, 0, thumbnail->width(), thumbnail->height(),
-          thumbnail_rect.left, thumbnail_rect.top,
-          thumbnail_rect.Width(), thumbnail_rect.Height(),
+          thumbnail_rect.x(), thumbnail_rect.y(),
+          thumbnail_rect.width(), thumbnail_rect.height(),
           true);
     } else {
       canvas->FillRectInt(SK_ColorWHITE,
-                          thumbnail_rect.left, thumbnail_rect.top,
-                          thumbnail_rect.Width(), thumbnail_rect.Height());
+                          thumbnail_rect.x(), thumbnail_rect.y(),
+                          thumbnail_rect.width(), thumbnail_rect.height());
     }
     canvas->DrawRectInt(SkColorSetRGB(153, 153, 191),
-                        thumbnail_rect.left, thumbnail_rect.top,
-                        thumbnail_rect.Width(), thumbnail_rect.Height());
+                        thumbnail_rect.x(), thumbnail_rect.y(),
+                        thumbnail_rect.width(), thumbnail_rect.height());
   }
 
   // Draw the favicon.
   SkBitmap* favicon = model_->GetFavicon(model_index_);
   if (favicon) {
     // WARNING: if you change these values, update the code that determines
     // whether we should allow a drag (GetDragRegion).
 
     // We need to tweak the favicon position if the UI layout is RTL.
     gfx::Rect favicon_bounds;
     favicon_bounds.set_x(title_link_->x() - kIconPadding - kFavIconSize);
     favicon_bounds.set_y(kEntryPadding);
     favicon_bounds.set_width(favicon->width());
     favicon_bounds.set_height(favicon->height());
     favicon_bounds.set_x(MirroredLeftPointForRect(favicon_bounds));
 
     // Drawing the bitmap using the possibly adjusted bounds.
     canvas->DrawBitmapInt(*favicon, favicon_bounds.x(), favicon_bounds.y());
   }
 
   // The remainder of painting is handled by drawing our children, which
   // is managed by the View class for us.
 }
 
 void HistoryItemRenderer::Layout() {
   // Figure out the maximum x-position of any text.
-  CRect thumbnail_rect;
+  gfx::Rect thumbnail_rect;
   int max_x;
   if (show_full_) {
     GetThumbnailBounds(&thumbnail_rect);
-    max_x = thumbnail_rect.left - kEntryPadding;
+    max_x = thumbnail_rect.x() - kEntryPadding;
   } else {
     max_x = width() - kEntryPadding;
   }
 
   // Calculate the ideal positions of some items. If possible, we
   // want the title to line up with kPageTitleOffset (and we would lay
   // out the star and the favicon to the left of that), but in cases
   // where font or language choices cause the time label to be
   // horizontally large, we need to push everything to the right.
   //
@@ skipping 72 matching lines @@
   if (show_full_) {
     const Snippet& snippet = model_->GetSnippet(model_index_);
     if (snippet.text().empty()) {
       snippet_label_->SetSnippet(Snippet());  // Bug 843469 will fix this.
     } else {
       snippet_label_->SetSnippet(snippet);
     }
     snippet_label_->SetBounds(title_x,
                               kEntryPadding + snippet_label_->GetLineHeight(),
                               std::min(
-                                  static_cast<int>(thumbnail_rect.left -
+                                  static_cast<int>(thumbnail_rect.x() -
                                                    title_x),
                                   kMaxSnippetWidth) -
                               kEntryPadding * 2,
                               snippet_label_->GetLineHeight() * 2);
   }
 }
 
 int HistoryItemRenderer::GetDragOperations(int x, int y) {
   if (GetDragRegion(x, y) != NONE)
     return DragDropTypes::DRAG_COPY | DragDropTypes::DRAG_LINK;
@@ skipping 82 matching lines @@
     favicon_bounds.set_width(favicon->width());
     favicon_bounds.set_height(favicon->height());
     favicon_bounds.set_x(MirroredLeftPointForRect(favicon_bounds));
     if (favicon_bounds.Contains(x, y)) {
       return FAV_ICON;
     }
   }
 
   // Is it over the thumbnail?
   if (show_full_ && model_->GetThumbnail(model_index_)) {
-    CRect thumbnail_loc;
+    gfx::Rect thumbnail_loc;
     GetThumbnailBounds(&thumbnail_loc);
 
     // If the UI layout is right-to-left, we mirror the thumbnail bounds before
     // we check whether or not it contains the point in question.
-    gfx::Rect mirrored_loc(thumbnail_loc);
-    thumbnail_loc.MoveToX(MirroredLeftPointForRect(mirrored_loc));
-    if (gfx::Rect(thumbnail_loc).Contains(x, y))
+    thumbnail_loc.set_x(MirroredLeftPointForRect(thumbnail_loc));
+    if (thumbnail_loc.Contains(x, y))
       return THUMBNAIL;
   }
 
   return NONE;
 }
 
 HistoryView::HistoryView(SearchableUIContainer* container,
                          BaseHistoryModel* model,
                          PageNavigator* navigator)
     : container_(container),
@@ skipping 667 matching lines @@
   // NOTE: the height here is too big, it should be just big enough to show
   // the link. Additionally this should be baseline aligned with the date. I'm
   // not doing that now as a redesign of HistoryView is in the works.
   const int delete_width = GetDeleteControlWidth();
   const int delete_x = width() - kRightMargin - delete_width;
   return gfx::Rect(delete_x,
                    base_y + kDeleteControlOffset,
                    delete_width,
                    kBrowseResultsHeight);
 }