summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 20:41:10 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 20:41:10 +0000
commitbe952c3ca6d93968409b246c9439a7d8c2a06bba (patch)
tree501d38ada79c1fddf10f65fe6c88b27a3df4cb1d /views
parent86c008e8a7da9c00c5a676eb201ba5d0c976748e (diff)
downloadchromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.zip
chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.gz
chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.bz2
Fix a ton of compiler warnings.
Most of these are classes with virtual methods lacking virtual destructors or NULL used in non-pointer context. BUG=none TEST=app_unittests && base_unittests --gtest_filter=-ConditionVariableTest.LargeFastTaskTest patch by Jacob Mandelson <jlmjlm [at] gmail> http://codereview.chromium.org/171028/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/accelerator.h6
-rw-r--r--views/controls/menu/simple_menu_model.h3
-rw-r--r--views/view.h8
3 files changed, 14 insertions, 3 deletions
diff --git a/views/accelerator.h b/views/accelerator.h
index bb8f91f..2b62193 100644
--- a/views/accelerator.h
+++ b/views/accelerator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -36,7 +36,7 @@ class Accelerator {
modifiers_ = accelerator.modifiers_;
}
- ~Accelerator() { };
+ ~Accelerator() {};
Accelerator& operator=(const Accelerator& accelerator) {
if (this != &accelerator) {
@@ -95,6 +95,8 @@ class AcceleratorTarget {
public:
// This method should return true if the accelerator was processed.
virtual bool AcceleratorPressed(const Accelerator& accelerator) = 0;
+ protected:
+ ~AcceleratorTarget() {}
};
}
diff --git a/views/controls/menu/simple_menu_model.h b/views/controls/menu/simple_menu_model.h
index 2be2cbc..4671f3e 100644
--- a/views/controls/menu/simple_menu_model.h
+++ b/views/controls/menu/simple_menu_model.h
@@ -44,6 +44,9 @@ class SimpleMenuModel : public Menu2Model {
// Performs the action associated with the specified command id.
virtual void ExecuteCommand(int command_id) = 0;
+
+ protected:
+ ~Delegate() {}
};
// The Delegate can be NULL, though if it is items can't be checked or
diff --git a/views/view.h b/views/view.h
index 66ef76f..7742d03 100644
--- a/views/view.h
+++ b/views/view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -68,6 +68,9 @@ class ContextMenuController {
int x,
int y,
bool is_mouse_gesture) = 0;
+
+ protected:
+ ~ContextMenuController() {}
};
// DragController is responsible for writing drag data for a view, as well as
@@ -85,6 +88,9 @@ class DragController {
// Returns the supported drag operations (see DragDropTypes for possible
// values). A drag is only started if this returns a non-zero value.
virtual int GetDragOperations(View* sender, int x, int y) = 0;
+
+ protected:
+ ~DragController() {}
};