diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 01:04:18 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 01:04:18 +0000 |
| commit | c3fac080f2f42ab386f0a6e834351ab220be8d4a (patch) | |
| tree | 7e56c8c6bd1aa1c576f90c2335322f743a6e1d79 /chrome/browser/ui/views/browser_actions_container.h | |
| parent | 8ef4d59eff51761c3d2243fb813d088eb2511989 (diff) | |
| download | chromium_src-c3fac080f2f42ab386f0a6e834351ab220be8d4a.zip chromium_src-c3fac080f2f42ab386f0a6e834351ab220be8d4a.tar.gz chromium_src-c3fac080f2f42ab386f0a6e834351ab220be8d4a.tar.bz2 | |
Rename the methods in DragController.
They used to have the same name as methods in View. Some views would
derive from both View and DragController, which was confusing. For
example for clang's -Woverride-virtual.
No functionality change.
BUG=70465,72205
TEST=none
Review URL: http://codereview.chromium.org/6609033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/browser_actions_container.h')
| -rw-r--r-- | chrome/browser/ui/views/browser_actions_container.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index 94c13139e..3400885 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -10,6 +10,7 @@ #include <string> #include <vector> +#include "base/compiler_specific.h" #include "base/task.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/extension_toolbar_model.h" @@ -337,13 +338,14 @@ class BrowserActionsContainer virtual void RunMenu(View* source, const gfx::Point& pt); // Overridden from views::DragController: - virtual void WriteDragData(View* sender, - const gfx::Point& press_pt, - ui::OSExchangeData* data); - virtual int GetDragOperations(View* sender, const gfx::Point& p); - virtual bool CanStartDrag(View* sender, - const gfx::Point& press_pt, - const gfx::Point& p); + virtual void WriteDragDataForView(View* sender, + const gfx::Point& press_pt, + ui::OSExchangeData* data) OVERRIDE; + virtual int GetDragOperationsForView(View* sender, + const gfx::Point& p) OVERRIDE; + virtual bool CanStartDragForView(View* sender, + const gfx::Point& press_pt, + const gfx::Point& p) OVERRIDE; // Overridden from ResizeArea::ResizeAreaDelegate: virtual void OnResize(int resize_amount, bool done_resizing); |