Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc |
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc |
index bea6b653c01380a81d1a5c9eab6ad431d26fd478..9f1b86e59013792c196becb864fee2a3aebd146e 100644 |
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc |
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc |
@@ -69,7 +69,7 @@ class TabDragControllerInteractiveUITestUserData |
: public base::SupportsUserData::Data { |
public: |
explicit TabDragControllerInteractiveUITestUserData(int id) : id_(id) {} |
- virtual ~TabDragControllerInteractiveUITestUserData() {} |
+ ~TabDragControllerInteractiveUITestUserData() override {} |
int id() { return id_; } |
private: |
@@ -85,16 +85,16 @@ class QuitDraggingObserver : public content::NotificationObserver { |
content::NotificationService::AllSources()); |
} |
- virtual void Observe(int type, |
- const content::NotificationSource& source, |
- const content::NotificationDetails& details) override { |
+ void Observe(int type, |
+ const content::NotificationSource& source, |
+ const content::NotificationDetails& details) override { |
DCHECK_EQ(chrome::NOTIFICATION_TAB_DRAG_LOOP_DONE, type); |
base::MessageLoopForUI::current()->Quit(); |
delete this; |
} |
private: |
- virtual ~QuitDraggingObserver() {} |
+ ~QuitDraggingObserver() override {} |
content::NotificationRegistrar registrar_; |
@@ -218,15 +218,14 @@ class ScreenEventGeneratorDelegate |
public: |
explicit ScreenEventGeneratorDelegate(aura::Window* root_window) |
: root_window_(root_window) {} |
- virtual ~ScreenEventGeneratorDelegate() {} |
+ ~ScreenEventGeneratorDelegate() override {} |
// EventGeneratorDelegateAura overrides: |
- virtual aura::WindowTreeHost* GetHostAt( |
- const gfx::Point& point) const override { |
+ aura::WindowTreeHost* GetHostAt(const gfx::Point& point) const override { |
return root_window_->GetHost(); |
} |
- virtual aura::client::ScreenPositionClient* GetScreenPositionClient( |
+ aura::client::ScreenPositionClient* GetScreenPositionClient( |
const aura::Window* window) const override { |
return aura::client::GetScreenPositionClient(root_window_); |
} |
@@ -254,13 +253,13 @@ class TestDesktopBrowserFrameAura : public DesktopBrowserFrameAura { |
BrowserView* browser_view) |
: DesktopBrowserFrameAura(browser_frame, browser_view), |
release_capture_(false) {} |
- virtual ~TestDesktopBrowserFrameAura() {} |
+ ~TestDesktopBrowserFrameAura() override {} |
void ReleaseCaptureOnNextClear() { |
release_capture_ = true; |
} |
- virtual void ClearNativeFocus() override { |
+ void ClearNativeFocus() override { |
views::DesktopNativeWidgetAura::ClearNativeFocus(); |
if (release_capture_) { |
release_capture_ = false; |
@@ -279,11 +278,10 @@ class TestDesktopBrowserFrameAura : public DesktopBrowserFrameAura { |
class TestNativeBrowserFrameFactory : public NativeBrowserFrameFactory { |
public: |
TestNativeBrowserFrameFactory() {} |
- virtual ~TestNativeBrowserFrameFactory() {} |
+ ~TestNativeBrowserFrameFactory() override {} |
- virtual NativeBrowserFrame* Create( |
- BrowserFrame* browser_frame, |
- BrowserView* browser_view) override { |
+ NativeBrowserFrame* Create(BrowserFrame* browser_frame, |
+ BrowserView* browser_view) override { |
return new TestDesktopBrowserFrameAura(browser_frame, browser_view); |
} |
@@ -358,7 +356,7 @@ class DetachToBrowserTabDragControllerTest |
public: |
DetachToBrowserTabDragControllerTest() {} |
- virtual void SetUpOnMainThread() override { |
+ void SetUpOnMainThread() override { |
#if defined(OS_CHROMEOS) |
event_generator_.reset( |
new ui::test::EventGenerator(ash::Shell::GetPrimaryRootWindow())); |