summaryrefslogtreecommitdiffstats
path: root/ui/views/layout
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 18:07:30 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 18:07:30 +0000
commit1b5ae45bb9785e6be6b3d2904fbb5f323b2d487d (patch)
tree10cc8645ab2fed663af9207d2caa2a1bc1db18ac /ui/views/layout
parentaddc1be9629d2e030a853eefecf6997a229b91b9 (diff)
downloadchromium_src-1b5ae45bb9785e6be6b3d2904fbb5f323b2d487d.zip
chromium_src-1b5ae45bb9785e6be6b3d2904fbb5f323b2d487d.tar.gz
chromium_src-1b5ae45bb9785e6be6b3d2904fbb5f323b2d487d.tar.bz2
Add OVERRIDE to ui/.
BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8632024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/layout')
-rw-r--r--ui/views/layout/fill_layout.h5
-rw-r--r--ui/views/layout/grid_layout.h15
2 files changed, 11 insertions, 9 deletions
diff --git a/ui/views/layout/fill_layout.h b/ui/views/layout/fill_layout.h
index c57adf0..b7d4c41 100644
--- a/ui/views/layout/fill_layout.h
+++ b/ui/views/layout/fill_layout.h
@@ -6,6 +6,7 @@
#define UI_VIEWS_LAYOUT_FILL_LAYOUT_H_
#pragma once
+#include "base/compiler_specific.h"
#include "ui/views/layout/layout_manager.h"
#include "views/view.h"
@@ -24,8 +25,8 @@ class VIEWS_EXPORT FillLayout : public LayoutManager {
virtual ~FillLayout();
// Overridden from LayoutManager:
- virtual void Layout(View* host);
- virtual gfx::Size GetPreferredSize(View* host);
+ virtual void Layout(View* host) OVERRIDE;
+ virtual gfx::Size GetPreferredSize(View* host) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(FillLayout);
diff --git a/ui/views/layout/grid_layout.h b/ui/views/layout/grid_layout.h
index ea0aba7..a57e16d 100644
--- a/ui/views/layout/grid_layout.h
+++ b/ui/views/layout/grid_layout.h
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
+#include "base/compiler_specific.h"
#include "ui/views/layout/layout_manager.h"
#include "views/view.h"
@@ -162,25 +163,25 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
// Notification we've been installed on a particular host. Checks that host
// is the same as the View supplied in the constructor.
- virtual void Installed(View* host);
+ virtual void Installed(View* host) OVERRIDE;
// Notification we've been uninstalled on a particular host. Checks that host
// is the same as the View supplied in the constructor.
- virtual void Uninstalled(View* host);
+ virtual void Uninstalled(View* host) OVERRIDE;
// Notification that a view has been added.
- virtual void ViewAdded(View* host, View* view);
+ virtual void ViewAdded(View* host, View* view) OVERRIDE;
// Notification that a view has been removed.
- virtual void ViewRemoved(View* host, View* view);
+ virtual void ViewRemoved(View* host, View* view) OVERRIDE;
// Layouts out the components.
- virtual void Layout(View* host);
+ virtual void Layout(View* host) OVERRIDE;
// Returns the preferred size for the GridLayout.
- virtual gfx::Size GetPreferredSize(View* host);
+ virtual gfx::Size GetPreferredSize(View* host) OVERRIDE;
- virtual int GetPreferredHeightForWidth(View* host, int width);
+ virtual int GetPreferredHeightForWidth(View* host, int width) OVERRIDE;
private:
// As both Layout and GetPreferredSize need to do nearly the same thing,