summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-06 00:42:24 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-06 00:42:24 +0000
commit295b2034a6db96c2b9406edf00716a26e638c429 (patch)
treee6ea052d64b38340831bb1b0199c8b6aa97e4d83
parent7a6ba6abc5792f2ec46ef8411f26a0a69e2036e8 (diff)
downloadchromium_src-295b2034a6db96c2b9406edf00716a26e638c429.zip
chromium_src-295b2034a6db96c2b9406edf00716a26e638c429.tar.gz
chromium_src-295b2034a6db96c2b9406edf00716a26e638c429.tar.bz2
Make TabContentsView implementations use OVERRIDE
I want to change a function prototype and I'm scared of getting it wrong in a subclass. Review URL: http://codereview.chromium.org/7569022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95702 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_gtk.h40
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_mac.h40
-rw-r--r--chrome/browser/ui/views/tab_contents/tab_contents_view_views.h2
3 files changed, 42 insertions, 40 deletions
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.h b/chrome/browser/tab_contents/tab_contents_view_gtk.h
index 3aafee9..5a91659 100644
--- a/chrome/browser/tab_contents/tab_contents_view_gtk.h
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.h
@@ -45,29 +45,29 @@ class TabContentsViewGtk : public TabContentsView,
// TabContentsView implementation --------------------------------------------
- virtual void CreateView(const gfx::Size& initial_size);
+ virtual void CreateView(const gfx::Size& initial_size) OVERRIDE;
virtual RenderWidgetHostView* CreateViewForWidget(
- RenderWidgetHost* render_widget_host);
+ RenderWidgetHost* render_widget_host) OVERRIDE;
- virtual gfx::NativeView GetNativeView() const;
- virtual gfx::NativeView GetContentNativeView() const;
- virtual gfx::NativeWindow GetTopLevelNativeWindow() const;
- virtual void GetContainerBounds(gfx::Rect* out) const;
- virtual void SetPageTitle(const std::wstring& title);
+ virtual gfx::NativeView GetNativeView() const OVERRIDE;
+ virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
+ virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
+ virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
+ virtual void SetPageTitle(const std::wstring& title) OVERRIDE;
virtual void OnTabCrashed(base::TerminationStatus status,
- int error_code);
- virtual void SizeContents(const gfx::Size& size);
- virtual void RenderViewCreated(RenderViewHost* host);
- virtual void Focus();
- virtual void SetInitialFocus();
- virtual void StoreFocus();
- virtual void RestoreFocus();
- virtual void UpdatePreferredSize(const gfx::Size& pref_size);
- virtual bool IsDoingDrag() const;
- virtual void CancelDragAndCloseTab();
- virtual bool IsEventTracking() const;
- virtual void CloseTabAfterEventTracking();
- virtual void GetViewBounds(gfx::Rect* out) const;
+ int error_code) OVERRIDE;
+ virtual void SizeContents(const gfx::Size& size) OVERRIDE;
+ virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
+ virtual void Focus() OVERRIDE;
+ virtual void SetInitialFocus() OVERRIDE;
+ virtual void StoreFocus() OVERRIDE;
+ virtual void RestoreFocus() OVERRIDE;
+ virtual void UpdatePreferredSize(const gfx::Size& pref_size) OVERRIDE;
+ virtual bool IsDoingDrag() const OVERRIDE;
+ virtual void CancelDragAndCloseTab() OVERRIDE;
+ virtual bool IsEventTracking() const OVERRIDE;
+ virtual void CloseTabAfterEventTracking() OVERRIDE;
+ virtual void GetViewBounds(gfx::Rect* out) const OVERRIDE;
// Backend implementation of RenderViewHostDelegate::View.
virtual void CreateNewWindow(
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.h b/chrome/browser/tab_contents/tab_contents_view_mac.h
index 4a7e319..3e7cea4 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.h
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.h
@@ -55,28 +55,28 @@ class TabContentsViewMac : public TabContentsView,
// TabContentsView implementation --------------------------------------------
- virtual void CreateView(const gfx::Size& initial_size);
+ virtual void CreateView(const gfx::Size& initial_size) OVERRIDE;
virtual RenderWidgetHostView* CreateViewForWidget(
- RenderWidgetHost* render_widget_host);
- virtual gfx::NativeView GetNativeView() const;
- virtual gfx::NativeView GetContentNativeView() const;
- virtual gfx::NativeWindow GetTopLevelNativeWindow() const;
- virtual void GetContainerBounds(gfx::Rect* out) const;
- virtual void RenderViewCreated(RenderViewHost* host);
- virtual void SetPageTitle(const std::wstring& title);
+ RenderWidgetHost* render_widget_host) OVERRIDE;
+ virtual gfx::NativeView GetNativeView() const OVERRIDE;
+ virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
+ virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
+ virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
+ virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
+ virtual void SetPageTitle(const std::wstring& title) OVERRIDE;
virtual void OnTabCrashed(base::TerminationStatus status,
- int error_code);
- virtual void SizeContents(const gfx::Size& size);
- virtual void Focus();
- virtual void SetInitialFocus();
- virtual void StoreFocus();
- virtual void RestoreFocus();
- virtual void UpdatePreferredSize(const gfx::Size& pref_size);
- virtual bool IsDoingDrag() const;
- virtual void CancelDragAndCloseTab();
- virtual bool IsEventTracking() const;
- virtual void CloseTabAfterEventTracking();
- virtual void GetViewBounds(gfx::Rect* out) const;
+ int error_code) OVERRIDE;
+ virtual void SizeContents(const gfx::Size& size) OVERRIDE;
+ virtual void Focus() OVERRIDE;
+ virtual void SetInitialFocus() OVERRIDE;
+ virtual void StoreFocus() OVERRIDE;
+ virtual void RestoreFocus() OVERRIDE;
+ virtual void UpdatePreferredSize(const gfx::Size& pref_size) OVERRIDE;
+ virtual bool IsDoingDrag() const OVERRIDE;
+ virtual void CancelDragAndCloseTab() OVERRIDE;
+ virtual bool IsEventTracking() const OVERRIDE;
+ virtual void CloseTabAfterEventTracking() OVERRIDE;
+ virtual void GetViewBounds(gfx::Rect* out) const OVERRIDE;
// Backend implementation of RenderViewHostDelegate::View.
virtual void CreateNewWindow(
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
index e57af7d..8c6b09e 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
@@ -70,6 +70,8 @@ class TabContentsViewViews : public views::Widget,
virtual bool IsEventTracking() const;
virtual void CloseTabAfterEventTracking();
virtual void GetViewBounds(gfx::Rect* out) const OVERRIDE;
+
+ // Implementation of RenderViewHostDelegate::View.
virtual void CreateNewWindow(
int route_id,
const ViewHostMsg_CreateWindow_Params& params) OVERRIDE;