Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(760)

Side by Side Diff: content/browser/web_contents/web_contents_view_android.h

Issue 628213003: Replace OVERRIDE and FINAL with override and final in content/browser/web_contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 9 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
10 #include "content/browser/web_contents/web_contents_view.h" 10 #include "content/browser/web_contents/web_contents_view.h"
(...skipping 12 matching lines...) Expand all
23 WebContentsViewAndroid(WebContentsImpl* web_contents, 23 WebContentsViewAndroid(WebContentsImpl* web_contents,
24 WebContentsViewDelegate* delegate); 24 WebContentsViewDelegate* delegate);
25 virtual ~WebContentsViewAndroid(); 25 virtual ~WebContentsViewAndroid();
26 26
27 // Sets the interface to the view system. ContentViewCoreImpl is owned 27 // Sets the interface to the view system. ContentViewCoreImpl is owned
28 // by its Java ContentViewCore counterpart, whose lifetime is managed 28 // by its Java ContentViewCore counterpart, whose lifetime is managed
29 // by the UI frontend. 29 // by the UI frontend.
30 void SetContentViewCore(ContentViewCoreImpl* content_view_core); 30 void SetContentViewCore(ContentViewCoreImpl* content_view_core);
31 31
32 // WebContentsView implementation -------------------------------------------- 32 // WebContentsView implementation --------------------------------------------
33 virtual gfx::NativeView GetNativeView() const OVERRIDE; 33 virtual gfx::NativeView GetNativeView() const override;
34 virtual gfx::NativeView GetContentNativeView() const OVERRIDE; 34 virtual gfx::NativeView GetContentNativeView() const override;
35 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; 35 virtual gfx::NativeWindow GetTopLevelNativeWindow() const override;
36 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE; 36 virtual void GetContainerBounds(gfx::Rect* out) const override;
37 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 37 virtual void SizeContents(const gfx::Size& size) override;
38 virtual void Focus() OVERRIDE; 38 virtual void Focus() override;
39 virtual void SetInitialFocus() OVERRIDE; 39 virtual void SetInitialFocus() override;
40 virtual void StoreFocus() OVERRIDE; 40 virtual void StoreFocus() override;
41 virtual void RestoreFocus() OVERRIDE; 41 virtual void RestoreFocus() override;
42 virtual DropData* GetDropData() const OVERRIDE; 42 virtual DropData* GetDropData() const override;
43 virtual gfx::Rect GetViewBounds() const OVERRIDE; 43 virtual gfx::Rect GetViewBounds() const override;
44 virtual void CreateView( 44 virtual void CreateView(
45 const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE; 45 const gfx::Size& initial_size, gfx::NativeView context) override;
46 virtual RenderWidgetHostViewBase* CreateViewForWidget( 46 virtual RenderWidgetHostViewBase* CreateViewForWidget(
47 RenderWidgetHost* render_widget_host) OVERRIDE; 47 RenderWidgetHost* render_widget_host) override;
48 virtual RenderWidgetHostViewBase* CreateViewForPopupWidget( 48 virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
49 RenderWidgetHost* render_widget_host) OVERRIDE; 49 RenderWidgetHost* render_widget_host) override;
50 virtual void SetPageTitle(const base::string16& title) OVERRIDE; 50 virtual void SetPageTitle(const base::string16& title) override;
51 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; 51 virtual void RenderViewCreated(RenderViewHost* host) override;
52 virtual void RenderViewSwappedIn(RenderViewHost* host) OVERRIDE; 52 virtual void RenderViewSwappedIn(RenderViewHost* host) override;
53 virtual void SetOverscrollControllerEnabled(bool enabled) OVERRIDE; 53 virtual void SetOverscrollControllerEnabled(bool enabled) override;
54 54
55 // Backend implementation of RenderViewHostDelegateView. 55 // Backend implementation of RenderViewHostDelegateView.
56 virtual void ShowContextMenu(RenderFrameHost* render_frame_host, 56 virtual void ShowContextMenu(RenderFrameHost* render_frame_host,
57 const ContextMenuParams& params) OVERRIDE; 57 const ContextMenuParams& params) override;
58 virtual void ShowPopupMenu(RenderFrameHost* render_frame_host, 58 virtual void ShowPopupMenu(RenderFrameHost* render_frame_host,
59 const gfx::Rect& bounds, 59 const gfx::Rect& bounds,
60 int item_height, 60 int item_height,
61 double item_font_size, 61 double item_font_size,
62 int selected_item, 62 int selected_item,
63 const std::vector<MenuItem>& items, 63 const std::vector<MenuItem>& items,
64 bool right_aligned, 64 bool right_aligned,
65 bool allow_multiple_selection) OVERRIDE; 65 bool allow_multiple_selection) override;
66 virtual void HidePopupMenu() OVERRIDE; 66 virtual void HidePopupMenu() override;
67 virtual void StartDragging(const DropData& drop_data, 67 virtual void StartDragging(const DropData& drop_data,
68 blink::WebDragOperationsMask allowed_ops, 68 blink::WebDragOperationsMask allowed_ops,
69 const gfx::ImageSkia& image, 69 const gfx::ImageSkia& image,
70 const gfx::Vector2d& image_offset, 70 const gfx::Vector2d& image_offset,
71 const DragEventSourceInfo& event_info) OVERRIDE; 71 const DragEventSourceInfo& event_info) override;
72 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; 72 virtual void UpdateDragCursor(blink::WebDragOperation operation) override;
73 virtual void GotFocus() OVERRIDE; 73 virtual void GotFocus() override;
74 virtual void TakeFocus(bool reverse) OVERRIDE; 74 virtual void TakeFocus(bool reverse) override;
75 75
76 private: 76 private:
77 // The WebContents whose contents we display. 77 // The WebContents whose contents we display.
78 WebContentsImpl* web_contents_; 78 WebContentsImpl* web_contents_;
79 79
80 // ContentViewCoreImpl is our interface to the view system. 80 // ContentViewCoreImpl is our interface to the view system.
81 ContentViewCoreImpl* content_view_core_; 81 ContentViewCoreImpl* content_view_core_;
82 82
83 // Interface for extensions to WebContentsView. Used to show the context menu. 83 // Interface for extensions to WebContentsView. Used to show the context menu.
84 scoped_ptr<WebContentsViewDelegate> delegate_; 84 scoped_ptr<WebContentsViewDelegate> delegate_;
85 85
86 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); 86 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
87 }; 87 };
88 88
89 } // namespace content 89 } // namespace content
90 90
91 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 91 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl_unittest.cc ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698