diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 00:13:01 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 00:13:01 +0000 |
commit | a8add2b949474a43d9852966b98c2774af060e1e (patch) | |
tree | e50a9987226f3d32b4ec8fbc188403ca67490792 /chrome/browser/ui/views/tabs | |
parent | e118ff727561aa0472333ea0fef9ff3b9ed8c541 (diff) | |
download | chromium_src-a8add2b949474a43d9852966b98c2774af060e1e.zip chromium_src-a8add2b949474a43d9852966b98c2774af060e1e.tar.gz chromium_src-a8add2b949474a43d9852966b98c2774af060e1e.tar.bz2 |
Rename Paint* -> OnPaint*
http://crbug.com/72040
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/6499030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/tabs')
-rw-r--r-- | chrome/browser/ui/views/tabs/dragged_tab_controller.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/tabs/dragged_tab_view.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/tabs/dragged_tab_view.h | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/tabs/side_tab.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/tabs/side_tab.h | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/tabs/tab.cc | 6 | ||||
-rw-r--r-- | chrome/browser/ui/views/tabs/tab.h | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index 0ee3832..f1345ad 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -80,7 +80,7 @@ class DockView : public views::View { return gfx::Size(DockInfo::popup_width(), DockInfo::popup_height()); } - virtual void PaintBackground(gfx::Canvas* canvas) { + virtual void OnPaintBackground(gfx::Canvas* canvas) { SkRect outer_rect = { SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(width()), SkIntToScalar(height()) }; diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.cc b/chrome/browser/ui/views/tabs/dragged_tab_view.cc index 367019e..0a08049 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_view.cc @@ -121,7 +121,7 @@ void DraggedTabView::Update() { /////////////////////////////////////////////////////////////////////////////// // DraggedTabView, views::View overrides: -void DraggedTabView::Paint(gfx::Canvas* canvas) { +void DraggedTabView::OnPaint(gfx::Canvas* canvas) { if (show_contents_on_drag_) PaintDetachedView(canvas); else diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.h b/chrome/browser/ui/views/tabs/dragged_tab_view.h index d2dda61..d404a31 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_view.h +++ b/chrome/browser/ui/views/tabs/dragged_tab_view.h @@ -52,7 +52,7 @@ class DraggedTabView : public views::View { private: // Overridden from views::View: - virtual void Paint(gfx::Canvas* canvas); + virtual void OnPaint(gfx::Canvas* canvas); virtual void Layout(); virtual gfx::Size GetPreferredSize(); diff --git a/chrome/browser/ui/views/tabs/side_tab.cc b/chrome/browser/ui/views/tabs/side_tab.cc index e29eeeb..89b0977 100644 --- a/chrome/browser/ui/views/tabs/side_tab.cc +++ b/chrome/browser/ui/views/tabs/side_tab.cc @@ -75,7 +75,7 @@ void SideTab::Layout() { font_height()); } -void SideTab::Paint(gfx::Canvas* canvas) { +void SideTab::OnPaint(gfx::Canvas* canvas) { if (ShouldPaintHighlight()) { SkPaint paint; paint.setColor(kTabBackgroundColor); diff --git a/chrome/browser/ui/views/tabs/side_tab.h b/chrome/browser/ui/views/tabs/side_tab.h index dde816b..540c45e 100644 --- a/chrome/browser/ui/views/tabs/side_tab.h +++ b/chrome/browser/ui/views/tabs/side_tab.h @@ -22,7 +22,7 @@ class SideTab : public BaseTab { // views::View Overrides: virtual void Layout(); - virtual void Paint(gfx::Canvas* canvas); + virtual void OnPaint(gfx::Canvas* canvas); virtual gfx::Size GetPreferredSize(); protected: diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 9cb04d9..56c268a 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -184,7 +184,7 @@ void Tab::DataChanged(const TabRendererData& old) { //////////////////////////////////////////////////////////////////////////////// // Tab, views::View overrides: -void Tab::Paint(gfx::Canvas* canvas) { +void Tab::OnPaint(gfx::Canvas* canvas) { // Don't paint if we're narrower than we can render correctly. (This should // only happen during animations). if (width() < GetMinimumUnselectedSize().width() && !data().mini) @@ -298,8 +298,8 @@ void Tab::Layout() { // Certain UI elements within the Tab (the favicon, etc.) are not represented // as child Views (which is the preferred method). Instead, these UI elements - // are drawn directly on the canvas from within Tab::Paint(). The Tab's child - // Views (for example, the Tab's close button which is a views::Button + // are drawn directly on the canvas from within Tab::OnPaint(). The Tab's + // child Views (for example, the Tab's close button which is a views::Button // instance) are automatically mirrored by the mirroring infrastructure in // views. The elements Tab draws directly on the canvas need to be manually // mirrored if the View's layout is right-to-left. diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h index a5b6c98..debd280 100644 --- a/chrome/browser/ui/views/tabs/tab.h +++ b/chrome/browser/ui/views/tabs/tab.h @@ -63,7 +63,7 @@ class Tab : public BaseTab { private: // Overridden from views::View: - virtual void Paint(gfx::Canvas* canvas); + virtual void OnPaint(gfx::Canvas* canvas); virtual void Layout(); virtual void OnThemeChanged(); virtual std::string GetClassName() const { return kViewClassName; } |