summaryrefslogtreecommitdiffstats
path: root/views/test/test_views_delegate.h
diff options
context:
space:
mode:
Diffstat (limited to 'views/test/test_views_delegate.h')
-rw-r--r--views/test/test_views_delegate.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/views/test/test_views_delegate.h b/views/test/test_views_delegate.h
index 3d4f2e6..cae1a64f 100644
--- a/views/test/test_views_delegate.h
+++ b/views/test/test_views_delegate.h
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/scoped_ptr.h"
-#include "ui/base/accessibility/accessibility_types.h"
#include "ui/base/clipboard/clipboard.h"
#include "views/views_delegate.h"
@@ -17,7 +16,7 @@ class TestViewsDelegate : public views::ViewsDelegate {
virtual ~TestViewsDelegate() {}
// Overridden from views::ViewsDelegate:
- virtual ui::Clipboard* GetClipboard() const OVERRIDE {
+ virtual ui::Clipboard* GetClipboard() const {
if (!clipboard_.get()) {
// Note that we need a MessageLoop for the next call to work.
clipboard_.reset(new ui::Clipboard);
@@ -27,32 +26,31 @@ class TestViewsDelegate : public views::ViewsDelegate {
virtual void SaveWindowPlacement(views::Window* window,
const std::wstring& window_name,
const gfx::Rect& bounds,
- bool maximized) OVERRIDE {
+ bool maximized) {
}
virtual bool GetSavedWindowBounds(views::Window* window,
const std::wstring& window_name,
- gfx::Rect* bounds) const OVERRIDE {
+ gfx::Rect* bounds) const {
return false;
}
virtual bool GetSavedMaximizedState(views::Window* window,
const std::wstring& window_name,
- bool* maximized) const OVERRIDE {
+ bool* maximized) const {
return false;
}
virtual void NotifyAccessibilityEvent(
- views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {}
-
+ views::View* view, AccessibilityTypes::Event event_type) {}
#if defined(OS_WIN)
- virtual HICON GetDefaultWindowIcon() const OVERRIDE {
+ virtual HICON GetDefaultWindowIcon() const {
return NULL;
}
#endif
-
- virtual void AddRef() OVERRIDE {}
- virtual void ReleaseRef() OVERRIDE {}
+ virtual void AddRef() {}
+ virtual void ReleaseRef() {}
private:
mutable scoped_ptr<ui::Clipboard> clipboard_;
DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
};
+