diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 03:04:36 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 03:04:36 +0000 |
| commit | baa8ace6a56d64883c1269b758d318bb95a5a246 (patch) | |
| tree | 490ab9138e17f9f20b4ca48d71e7098f51746b21 /views | |
| parent | 41f1660ce1d0af3ff6cb4b02cdfb86c540cae125 (diff) | |
| download | chromium_src-baa8ace6a56d64883c1269b758d318bb95a5a246.zip chromium_src-baa8ace6a56d64883c1269b758d318bb95a5a246.tar.gz chromium_src-baa8ace6a56d64883c1269b758d318bb95a5a246.tar.bz2 | |
Fix clang build, failure caused by r78149.
BUG=
TEST=
Review URL: http://codereview.chromium.org/6697013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/native_widget_delegate.h | 2 | ||||
| -rw-r--r-- | views/widget/widget.cc | 2 | ||||
| -rw-r--r-- | views/widget/widget.h | 2 | ||||
| -rw-r--r-- | views/widget/widget_gtk.cc | 2 | ||||
| -rw-r--r-- | views/widget/widget_win.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/views/widget/native_widget_delegate.h b/views/widget/native_widget_delegate.h index b21cd10..26e4828 100644 --- a/views/widget/native_widget_delegate.h +++ b/views/widget/native_widget_delegate.h @@ -39,7 +39,7 @@ class NativeWidgetDelegate { // Paints the rootview in the canvas. This will also refresh the compositor // tree if necessary when accelerated painting is enabled. - virtual void OnPaint(gfx::Canvas* canvas) = 0; + virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) = 0; }; } // namespace internal diff --git a/views/widget/widget.cc b/views/widget/widget.cc index 88c7bf3..8944ff9 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -265,7 +265,7 @@ bool Widget::HasFocusManager() const { return !!focus_manager_.get(); } -void Widget::OnPaint(gfx::Canvas* canvas) { +void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) { GetRootView()->Paint(canvas); RefreshCompositeTree(); } diff --git a/views/widget/widget.h b/views/widget/widget.h index 21f4f48..b094932 100644 --- a/views/widget/widget.h +++ b/views/widget/widget.h @@ -275,7 +275,7 @@ class Widget : public internal::NativeWidgetDelegate, virtual void OnNativeWidgetCreated() OVERRIDE; virtual void OnSizeChanged(const gfx::Size& new_size) OVERRIDE; virtual bool HasFocusManager() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE; // Overridden from FocusTraversable: virtual FocusSearch* GetFocusSearch() OVERRIDE; diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc index 0a89fee..e96df66 100644 --- a/views/widget/widget_gtk.cc +++ b/views/widget/widget_gtk.cc @@ -955,7 +955,7 @@ gboolean WidgetGtk::OnPaint(GtkWidget* widget, GdkEventExpose* event) { gfx::CanvasSkiaPaint canvas(event); if (!canvas.is_empty()) { canvas.set_composite_alpha(is_transparent()); - delegate_->OnPaint(&canvas); + delegate_->OnNativeWidgetPaint(&canvas); } return false; // False indicates other widgets should get the event as well. } diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index 823f7d4..68fad23 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -820,7 +820,7 @@ LRESULT WidgetWin::OnNotify(int w_param, NMHDR* l_param) { void WidgetWin::OnPaint(HDC dc) { scoped_ptr<gfx::CanvasPaint> canvas( gfx::CanvasPaint::CreateCanvasPaint(hwnd())); - delegate_->OnPaint(canvas->AsCanvas()); + delegate_->OnNativeWidgetPaint(canvas->AsCanvas()); } LRESULT WidgetWin::OnPowerBroadcast(DWORD power_event, DWORD data) { |