Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3146)

Unified Diff: chrome/browser/views/about_chrome_view.cc

Issue 113443: ChromeCanvas->gfx::Canvas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/views/about_chrome_view.cc
===================================================================
--- chrome/browser/views/about_chrome_view.cc (revision 16147)
+++ chrome/browser/views/about_chrome_view.cc (working copy)
@@ -6,7 +6,7 @@
#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"
@@ -351,7 +351,7 @@
}
-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.
@@ -424,7 +424,7 @@
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,
@@ -479,7 +479,7 @@
}
}
-void AboutChromeView::DrawTextStartingFrom(ChromeCanvas* canvas,
+void AboutChromeView::DrawTextStartingFrom(gfx::Canvas* canvas,
const std::wstring& text,
gfx::Size* position,
const gfx::Rect& bounds,
@@ -492,10 +492,10 @@
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.
« no previous file with comments | « chrome/browser/views/about_chrome_view.h ('k') | chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698