summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
Diffstat (limited to 'views/window')
-rw-r--r--views/window/custom_frame_view.cc14
-rw-r--r--views/window/custom_frame_view.h12
-rw-r--r--views/window/dialog_client_view.cc12
-rw-r--r--views/window/dialog_client_view.h8
-rw-r--r--views/window/window_win.cc10
5 files changed, 28 insertions, 28 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index f7f9ab3..2869c07 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -4,8 +4,8 @@
#include "views/window/custom_frame_view.h"
-#include "app/gfx/chrome_canvas.h"
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/canvas.h"
+#include "app/gfx/font.h"
#include "app/gfx/path.h"
#include "app/resource_bundle.h"
#include "app/theme_provider.h"
@@ -210,7 +210,7 @@ void CustomFrameView::ResetWindowControls() {
///////////////////////////////////////////////////////////////////////////////
// CustomFrameView, View overrides:
-void CustomFrameView::Paint(ChromeCanvas* canvas) {
+void CustomFrameView::Paint(gfx::Canvas* canvas) {
if (frame_->IsMaximized())
PaintMaximizedFrameBorder(canvas);
else
@@ -295,7 +295,7 @@ int CustomFrameView::TitleCoordinates(int* title_top_spacing,
BottomEdgeThicknessWithinNonClientHeight();
}
-void CustomFrameView::PaintRestoredFrameBorder(ChromeCanvas* canvas) {
+void CustomFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
// Window frame mode.
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -373,7 +373,7 @@ void CustomFrameView::PaintRestoredFrameBorder(ChromeCanvas* canvas) {
}
void CustomFrameView::PaintMaximizedFrameBorder(
- ChromeCanvas* canvas) {
+ gfx::Canvas* canvas) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
SkBitmap* top_edge = rb.GetBitmapNamed(IDR_WINDOW_TOP_CENTER);
@@ -388,7 +388,7 @@ void CustomFrameView::PaintMaximizedFrameBorder(
frame_->GetClientView()->y() - edge_height, width(), edge_height);
}
-void CustomFrameView::PaintTitleBar(ChromeCanvas* canvas) {
+void CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) {
WindowDelegate* d = frame_->GetDelegate();
// It seems like in some conditions we can be asked to paint after the window
@@ -402,7 +402,7 @@ void CustomFrameView::PaintTitleBar(ChromeCanvas* canvas) {
title_bounds_.width(), title_bounds_.height());
}
-void CustomFrameView::PaintRestoredClientEdge(ChromeCanvas* canvas) {
+void CustomFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
gfx::Rect client_area_bounds = frame_->GetClientView()->bounds();
int client_area_top = client_area_bounds.y();
diff --git a/views/window/custom_frame_view.h b/views/window/custom_frame_view.h
index 0c41009..bee9e62 100644
--- a/views/window/custom_frame_view.h
+++ b/views/window/custom_frame_view.h
@@ -11,12 +11,12 @@
#include "views/window/window_resources.h"
namespace gfx{
+class Canvas;
class Font;
class Size;
class Path;
class Point;
}
-class ChromeCanvas;
namespace views {
@@ -45,7 +45,7 @@ class CustomFrameView : public NonClientFrameView,
virtual void ResetWindowControls();
// View overrides:
- virtual void Paint(ChromeCanvas* canvas);
+ virtual void Paint(gfx::Canvas* canvas);
virtual void Layout();
virtual gfx::Size GetPreferredSize();
@@ -75,10 +75,10 @@ class CustomFrameView : public NonClientFrameView,
int* title_thickness) const;
// Paint various sub-components of this view.
- void PaintRestoredFrameBorder(ChromeCanvas* canvas);
- void PaintMaximizedFrameBorder(ChromeCanvas* canvas);
- void PaintTitleBar(ChromeCanvas* canvas);
- void PaintRestoredClientEdge(ChromeCanvas* canvas);
+ void PaintRestoredFrameBorder(gfx::Canvas* canvas);
+ void PaintMaximizedFrameBorder(gfx::Canvas* canvas);
+ void PaintTitleBar(gfx::Canvas* canvas);
+ void PaintRestoredClientEdge(gfx::Canvas* canvas);
// Layout various sub-components of this view.
void LayoutWindowControls();
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 9e25462..978d45a 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -8,8 +8,8 @@
#include <uxtheme.h>
#include <vsstyle.h>
-#include "app/gfx/chrome_canvas.h"
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/canvas.h"
+#include "app/gfx/font.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/gfx/native_theme.h"
@@ -34,7 +34,7 @@ void UpdateButtonHelper(NativeButton* button_view,
button_view->SetVisible(delegate->IsDialogButtonVisible(button));
}
-void FillViewWithSysColor(ChromeCanvas* canvas, View* view, COLORREF color) {
+void FillViewWithSysColor(gfx::Canvas* canvas, View* view, COLORREF color) {
SkColor sk_color =
SkColorSetRGB(GetRValue(color), GetGValue(color), GetBValue(color));
canvas->FillRectInt(sk_color, 0, 0, view->width(), view->height());
@@ -250,11 +250,11 @@ int DialogClientView::NonClientHitTest(const gfx::Point& point) {
////////////////////////////////////////////////////////////////////////////////
// DialogClientView, View overrides:
-void DialogClientView::Paint(ChromeCanvas* canvas) {
+void DialogClientView::Paint(gfx::Canvas* canvas) {
FillViewWithSysColor(canvas, this, GetSysColor(COLOR_3DFACE));
}
-void DialogClientView::PaintChildren(ChromeCanvas* canvas) {
+void DialogClientView::PaintChildren(gfx::Canvas* canvas) {
View::PaintChildren(canvas);
if (!window()->IsMaximized() && !window()->IsMinimized())
PaintSizeBox(canvas);
@@ -347,7 +347,7 @@ void DialogClientView::ButtonPressed(Button* sender) {
////////////////////////////////////////////////////////////////////////////////
// DialogClientView, private:
-void DialogClientView::PaintSizeBox(ChromeCanvas* canvas) {
+void DialogClientView::PaintSizeBox(gfx::Canvas* canvas) {
if (window()->GetDelegate()->CanResize() ||
window()->GetDelegate()->CanMaximize()) {
HDC dc = canvas->beginPlatformPaint();
diff --git a/views/window/dialog_client_view.h b/views/window/dialog_client_view.h
index c1e6ed8..ecb9449 100644
--- a/views/window/dialog_client_view.h
+++ b/views/window/dialog_client_view.h
@@ -5,7 +5,7 @@
#ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
#define VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/font.h"
#include "views/focus/focus_manager.h"
#include "views/controls/button/button.h"
#include "views/window/client_view.h"
@@ -61,8 +61,8 @@ class DialogClientView : public ClientView,
protected:
// View overrides:
- virtual void Paint(ChromeCanvas* canvas);
- virtual void PaintChildren(ChromeCanvas* canvas);
+ virtual void Paint(gfx::Canvas* canvas);
+ virtual void PaintChildren(gfx::Canvas* canvas);
virtual void Layout();
virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
virtual gfx::Size GetPreferredSize();
@@ -74,7 +74,7 @@ class DialogClientView : public ClientView,
private:
// Paint the size box in the bottom right corner of the window if it is
// resizable.
- void PaintSizeBox(ChromeCanvas* canvas);
+ void PaintSizeBox(gfx::Canvas* canvas);
// Returns the width of the specified dialog button using the correct font.
int GetButtonWidth(int button) const;
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 9c06e21..78fa32e 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -6,8 +6,8 @@
#include <shellapi.h>
-#include "app/gfx/chrome_canvas.h"
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/canvas.h"
+#include "app/gfx/font.h"
#include "app/gfx/icon_util.h"
#include "app/gfx/path.h"
#include "app/l10n_util.h"
@@ -862,11 +862,11 @@ void WindowWin::OnNCPaint(HRGN rgn) {
root_view->SchedulePaint(gfx::Rect(dirty_region), false);
- // ChromeCanvasPaints destructor does the actual painting. As such, wrap the
+ // gfx::CanvasPaints destructor does the actual painting. As such, wrap the
// following in a block to force paint to occur so that we can release the dc.
{
- ChromeCanvasPaint canvas(dc, opaque(), dirty_region.left, dirty_region.top,
- dirty_region.Width(), dirty_region.Height());
+ gfx::CanvasPaint canvas(dc, opaque(), dirty_region.left, dirty_region.top,
+ dirty_region.Width(), dirty_region.Height());
root_view->ProcessPaint(&canvas);
}
generated by cgit v1.1 at 2025-01-13 09:36:23 +0000