| Index: chrome/browser/ui/views/frame/browser_root_view.h
|
| diff --git a/chrome/browser/ui/views/frame/browser_root_view.h b/chrome/browser/ui/views/frame/browser_root_view.h
|
| index 4adf563cf0e84b2fa32286ce6cd6b6f2c8c0e60b..4a228feb91c8ea268738dfa4fba68c5163894dc6 100644
|
| --- a/chrome/browser/ui/views/frame/browser_root_view.h
|
| +++ b/chrome/browser/ui/views/frame/browser_root_view.h
|
| @@ -30,19 +30,19 @@ class BrowserRootView : public views::internal::RootView {
|
| // Overridden from views::View:
|
| virtual bool GetDropFormats(
|
| int* formats,
|
| - std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
|
| - virtual bool AreDropTypesRequired() OVERRIDE;
|
| - virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
|
| - virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
|
| - virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
|
| - virtual void OnDragExited() OVERRIDE;
|
| - virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
|
| - virtual const char* GetClassName() const OVERRIDE;
|
| - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
|
| + std::set<ui::OSExchangeData::CustomFormat>* custom_formats) override;
|
| + virtual bool AreDropTypesRequired() override;
|
| + virtual bool CanDrop(const ui::OSExchangeData& data) override;
|
| + virtual void OnDragEntered(const ui::DropTargetEvent& event) override;
|
| + virtual int OnDragUpdated(const ui::DropTargetEvent& event) override;
|
| + virtual void OnDragExited() override;
|
| + virtual int OnPerformDrop(const ui::DropTargetEvent& event) override;
|
| + virtual const char* GetClassName() const override;
|
| + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override;
|
|
|
| private:
|
| // ui::EventProcessor:
|
| - virtual void OnEventProcessingStarted(ui::Event* event) OVERRIDE;
|
| + virtual void OnEventProcessingStarted(ui::Event* event) override;
|
|
|
| // Returns true if the event should be forwarded to the tabstrip.
|
| bool ShouldForwardToTabStrip(const ui::DropTargetEvent& event);
|
|
|