ui/gfx: Convert Canvas::DrawFocusRect() to use gfx::Rect.

chrome/browser/ui/views/location_bar/location_bar_view.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/views/location_bar/location_bar_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 737 matching lines @@
     canvas->GetSkCanvas()->drawRoundRect(gfx::RectToSkRect(bounds), radius,
                                          radius, paint);
   } else {
     canvas->FillRectInt(color, bounds.x(), bounds.y(), bounds.width(),
                         bounds.height());
   }
 
   if (show_focus_rect_ && HasFocus()) {
     gfx::Rect r = location_entry_view_->bounds();
 #if defined(OS_WIN)
-    canvas->DrawFocusRect(r.x() - 1, r.y() - 1, r.width() + 2, r.height() + 2);
+    gfx::Rect rect(r.x() - 1, r.y() - 1, r.width() + 2, r.height() + 2);

[Peter Kasting, 2011/10/24 22:15:13]

Nit: Simpler:

#if defined(OS_WIN)
    r.Inset(-1, -1);
#else
    r.Inset(-1, 0);
#endif
    canvas->DrawFocusRect(r);

[tfarina, 2011/10/25 02:04:53]

Done.

+    canvas->DrawFocusRect(rect);
 #else
-    canvas->DrawFocusRect(r.x() - 1, r.y(), r.width() + 2, r.height());
+    gfx::Rect rect(r.x() - 1, r.y(), r.width() + 2, r.height());
+    canvas->DrawFocusRect(rect);
 #endif
   }
 }
 
 void LocationBarView::SetShowFocusRect(bool show) {
   show_focus_rect_ = show;
   SchedulePaint();
 }
 
 void LocationBarView::SelectAll() {
@@ skipping 501 matching lines @@
       !suggested_text_view_->GetText().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif