ChromeCanvas->gfx::Canvas

chrome/browser/views/about_chrome_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/views/about_chrome_view.h"
 
 #include <commdlg.h>
 
-#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "base/word_iterator.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/restart_message_box.h"
@@ skipping 324 matching lines @@
   int update_label_x = throbber_->x() + throbber_->width() +
                        kRelatedControlHorizontalSpacing;
   update_label_.SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   update_label_.SetBounds(update_label_x,
                           throbber_topleft_y + 1,
                           parent_bounds.width() - update_label_x,
                           sz.height());
 }
 
 
-void AboutChromeView::Paint(ChromeCanvas* canvas) {
+void AboutChromeView::Paint(gfx::Canvas* canvas) {
   views::View::Paint(canvas);
 
   // Draw the background image color (and the separator) across the dialog.
   // This will become the background for the logo image at the top of the
   // dialog.
   canvas->TileImageInt(*kBackgroundBmp, 0, 0,
                        dialog_dimensions_.width(), kBackgroundBmp->height());
 
   gfx::Font font =
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
@@ skipping 52 matching lines @@
   // Then position the Open Source URL within the main label.
   open_source_url_->SetBounds(open_source_url_rect_.x(),
                               open_source_url_rect_.y(),
                               open_source_url_rect_.width(),
                               open_source_url_rect_.height());
 
   // Save the height so we can set the bounds correctly.
   main_text_label_height_ = position.height() + font.height();
 }
 
-void AboutChromeView::DrawTextAndPositionUrl(ChromeCanvas* canvas,
+void AboutChromeView::DrawTextAndPositionUrl(gfx::Canvas* canvas,
                                              const std::wstring& text,
                                              views::Link* link,
                                              gfx::Rect* rect,
                                              gfx::Size* position,
                                              const gfx::Rect& bounds,
                                              const gfx::Font& font) {
   DCHECK(canvas && position);
 
   // What we get passed in as |text| is potentially a mix of LTR and RTL "runs"
   // (a run is a sequence of words that share the same directionality). We
@@ skipping 34 matching lines @@
 
     // Go from relative pixel coordinates (within the label we are drawing on)
     // to absolute pixel coordinates (relative to the top left corner of the
     // dialog content).
     rect->Offset(bounds.x(), bounds.y());
     // And leave some space to draw the link in.
     position->Enlarge(sz.width(), 0);
   }
 }
 
-void AboutChromeView::DrawTextStartingFrom(ChromeCanvas* canvas,
+void AboutChromeView::DrawTextStartingFrom(gfx::Canvas* canvas,
                                            const std::wstring& text,
                                            gfx::Size* position,
                                            const gfx::Rect& bounds,
                                            const gfx::Font& font,
                                            bool ltr_within_rtl) {
   // Iterate through line breaking opportunities (which in English would be
   // spaces and such. This tells us where to wrap.
   WordIterator iter(text, WordIterator::BREAK_LINE);
   if (!iter.Init())
     return;
 
   int flags = (text_direction_is_rtl_ ?
-                   ChromeCanvas::TEXT_ALIGN_RIGHT :
-                   ChromeCanvas::TEXT_ALIGN_LEFT) |
-              ChromeCanvas::MULTI_LINE |
-              ChromeCanvas::HIDE_PREFIX;
+                   gfx::Canvas::TEXT_ALIGN_RIGHT :
+                   gfx::Canvas::TEXT_ALIGN_LEFT) |
+              gfx::Canvas::MULTI_LINE |
+              gfx::Canvas::HIDE_PREFIX;
 
   // Iterate over each word in the text, or put in a more locale-neutral way:
   // iterate to the next line breaking opportunity.
   while (iter.Advance()) {
     // Get the word and figure out the dimensions.
     std::wstring word;
     if (!ltr_within_rtl)
       word = iter.GetWord();  // Get the next word.
     else
       word = text;  // Draw the whole text at once.
@@ skipping 310 matching lines @@
 
   // We have updated controls on the parent, so we need to update its layout.
   View* parent = GetParent();
   parent->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
   if (window())
     GetDialogClientView()->UpdateDialogButtons();
 }