Index: content/browser/web_contents/web_contents_view_aura.h |
diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h |
index 38652ba8597781ea1ae771bdf44aac2d547eb6d0..2105c0453aa46a4e7d3eb056d87bb1e746b080fe 100644 |
--- a/content/browser/web_contents/web_contents_view_aura.h |
+++ b/content/browser/web_contents/web_contents_view_aura.h |
@@ -103,89 +103,89 @@ class WebContentsViewAura |
void OverscrollUpdateForWebContentsDelegate(int delta_y); |
// Overridden from WebContentsView: |
- virtual gfx::NativeView GetNativeView() const OVERRIDE; |
- virtual gfx::NativeView GetContentNativeView() const OVERRIDE; |
- virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; |
- virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE; |
- virtual void SizeContents(const gfx::Size& size) OVERRIDE; |
- virtual void Focus() OVERRIDE; |
- virtual void SetInitialFocus() OVERRIDE; |
- virtual void StoreFocus() OVERRIDE; |
- virtual void RestoreFocus() OVERRIDE; |
- virtual DropData* GetDropData() const OVERRIDE; |
- virtual gfx::Rect GetViewBounds() const OVERRIDE; |
+ virtual gfx::NativeView GetNativeView() const override; |
+ virtual gfx::NativeView GetContentNativeView() const override; |
+ virtual gfx::NativeWindow GetTopLevelNativeWindow() const override; |
+ virtual void GetContainerBounds(gfx::Rect *out) const override; |
+ virtual void SizeContents(const gfx::Size& size) override; |
+ virtual void Focus() override; |
+ virtual void SetInitialFocus() override; |
+ virtual void StoreFocus() override; |
+ virtual void RestoreFocus() override; |
+ virtual DropData* GetDropData() const override; |
+ virtual gfx::Rect GetViewBounds() const override; |
virtual void CreateView( |
- const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE; |
+ const gfx::Size& initial_size, gfx::NativeView context) override; |
virtual RenderWidgetHostViewBase* CreateViewForWidget( |
- RenderWidgetHost* render_widget_host) OVERRIDE; |
+ RenderWidgetHost* render_widget_host) override; |
virtual RenderWidgetHostViewBase* CreateViewForPopupWidget( |
- RenderWidgetHost* render_widget_host) OVERRIDE; |
- virtual void SetPageTitle(const base::string16& title) OVERRIDE; |
- virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; |
- virtual void RenderViewSwappedIn(RenderViewHost* host) OVERRIDE; |
- virtual void SetOverscrollControllerEnabled(bool enabled) OVERRIDE; |
+ RenderWidgetHost* render_widget_host) override; |
+ virtual void SetPageTitle(const base::string16& title) override; |
+ virtual void RenderViewCreated(RenderViewHost* host) override; |
+ virtual void RenderViewSwappedIn(RenderViewHost* host) override; |
+ virtual void SetOverscrollControllerEnabled(bool enabled) override; |
// Overridden from RenderViewHostDelegateView: |
virtual void ShowContextMenu(RenderFrameHost* render_frame_host, |
- const ContextMenuParams& params) OVERRIDE; |
+ const ContextMenuParams& params) override; |
virtual void StartDragging(const DropData& drop_data, |
blink::WebDragOperationsMask operations, |
const gfx::ImageSkia& image, |
const gfx::Vector2d& image_offset, |
- const DragEventSourceInfo& event_info) OVERRIDE; |
- virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; |
- virtual void GotFocus() OVERRIDE; |
- virtual void TakeFocus(bool reverse) OVERRIDE; |
+ const DragEventSourceInfo& event_info) override; |
+ virtual void UpdateDragCursor(blink::WebDragOperation operation) override; |
+ virtual void GotFocus() override; |
+ virtual void TakeFocus(bool reverse) override; |
virtual void ShowDisambiguationPopup( |
const gfx::Rect& target_rect, |
const SkBitmap& zoomed_bitmap, |
const base::Callback<void(ui::GestureEvent*)>& gesture_cb, |
- const base::Callback<void(ui::MouseEvent*)>& mouse_cb) OVERRIDE; |
- virtual void HideDisambiguationPopup() OVERRIDE; |
+ const base::Callback<void(ui::MouseEvent*)>& mouse_cb) override; |
+ virtual void HideDisambiguationPopup() override; |
// Overridden from OverscrollControllerDelegate: |
- virtual gfx::Rect GetVisibleBounds() const OVERRIDE; |
- virtual bool OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE; |
- virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE; |
+ virtual gfx::Rect GetVisibleBounds() const override; |
+ virtual bool OnOverscrollUpdate(float delta_x, float delta_y) override; |
+ virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) override; |
virtual void OnOverscrollModeChange(OverscrollMode old_mode, |
- OverscrollMode new_mode) OVERRIDE; |
+ OverscrollMode new_mode) override; |
// Overridden from ui::ImplicitAnimationObserver: |
- virtual void OnImplicitAnimationsCompleted() OVERRIDE; |
+ virtual void OnImplicitAnimationsCompleted() override; |
// Overridden from aura::WindowDelegate: |
- virtual gfx::Size GetMinimumSize() const OVERRIDE; |
- virtual gfx::Size GetMaximumSize() const OVERRIDE; |
+ virtual gfx::Size GetMinimumSize() const override; |
+ virtual gfx::Size GetMaximumSize() const override; |
virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
- const gfx::Rect& new_bounds) OVERRIDE; |
- virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
- virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
+ const gfx::Rect& new_bounds) override; |
+ virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override; |
+ virtual int GetNonClientComponent(const gfx::Point& point) const override; |
virtual bool ShouldDescendIntoChildForEventHandling( |
aura::Window* child, |
- const gfx::Point& location) OVERRIDE; |
- virtual bool CanFocus() OVERRIDE; |
- virtual void OnCaptureLost() OVERRIDE; |
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
- virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; |
- virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; |
- virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; |
- virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; |
- virtual bool HasHitTestMask() const OVERRIDE; |
- virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; |
+ const gfx::Point& location) override; |
+ virtual bool CanFocus() override; |
+ virtual void OnCaptureLost() override; |
+ virtual void OnPaint(gfx::Canvas* canvas) override; |
+ virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; |
+ virtual void OnWindowDestroying(aura::Window* window) override; |
+ virtual void OnWindowDestroyed(aura::Window* window) override; |
+ virtual void OnWindowTargetVisibilityChanged(bool visible) override; |
+ virtual bool HasHitTestMask() const override; |
+ virtual void GetHitTestMask(gfx::Path* mask) const override; |
// Overridden from ui::EventHandler: |
- virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; |
- virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; |
+ virtual void OnKeyEvent(ui::KeyEvent* event) override; |
+ virtual void OnMouseEvent(ui::MouseEvent* event) override; |
// Overridden from aura::client::DragDropDelegate: |
- 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 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; |
// Overridden from aura::WindowObserver: |
virtual void OnWindowVisibilityChanged(aura::Window* window, |
- bool visible) OVERRIDE; |
+ bool visible) override; |
// Update the web contents visiblity. |
void UpdateWebContentsVisibility(bool visible); |