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

Side by Side Diff: chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_
6 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_ 6 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_
7 7
8 #include "chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h" 8 #include "chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h"
9 #include "chrome/browser/ui/zoom/zoom_observer.h" 9 #include "chrome/browser/ui/zoom/zoom_observer.h"
10 #include "extensions/browser/guest_view/web_view/web_view_guest.h" 10 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
(...skipping 10 matching lines...) Expand all
21 } // namespace ui 21 } // namespace ui
22 22
23 class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate, 23 class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate,
24 public ZoomObserver { 24 public ZoomObserver {
25 public : 25 public :
26 explicit ChromeWebViewGuestDelegate( 26 explicit ChromeWebViewGuestDelegate(
27 extensions::WebViewGuest* web_view_guest); 27 extensions::WebViewGuest* web_view_guest);
28 virtual ~ChromeWebViewGuestDelegate(); 28 virtual ~ChromeWebViewGuestDelegate();
29 29
30 // WebViewGuestDelegate implementation. 30 // WebViewGuestDelegate implementation.
31 virtual double GetZoom() OVERRIDE; 31 virtual double GetZoom() override;
32 virtual bool HandleContextMenu( 32 virtual bool HandleContextMenu(
33 const content::ContextMenuParams& params) OVERRIDE; 33 const content::ContextMenuParams& params) override;
34 virtual void OnAttachWebViewHelpers(content::WebContents* contents) OVERRIDE; 34 virtual void OnAttachWebViewHelpers(content::WebContents* contents) override;
35 virtual void OnDidAttachToEmbedder() OVERRIDE; 35 virtual void OnDidAttachToEmbedder() override;
36 virtual void OnDidCommitProvisionalLoadForFrame(bool is_main_frame) OVERRIDE; 36 virtual void OnDidCommitProvisionalLoadForFrame(bool is_main_frame) override;
37 virtual void OnDidInitialize() OVERRIDE; 37 virtual void OnDidInitialize() override;
38 virtual void OnDocumentLoadedInFrame( 38 virtual void OnDocumentLoadedInFrame(
39 content::RenderFrameHost* render_frame_host) OVERRIDE; 39 content::RenderFrameHost* render_frame_host) override;
40 virtual void OnGuestDestroyed() OVERRIDE; 40 virtual void OnGuestDestroyed() override;
41 virtual void OnSetZoom(double zoom_factor) OVERRIDE; 41 virtual void OnSetZoom(double zoom_factor) override;
42 virtual void OnShowContextMenu( 42 virtual void OnShowContextMenu(
43 int request_id, 43 int request_id,
44 const MenuItemVector* items) OVERRIDE; 44 const MenuItemVector* items) override;
45 45
46 // ZoomObserver implementation. 46 // ZoomObserver implementation.
47 virtual void OnZoomChanged( 47 virtual void OnZoomChanged(
48 const ZoomController::ZoomChangedEventData& data) OVERRIDE; 48 const ZoomController::ZoomChangedEventData& data) override;
49 49
50 extensions::WebViewGuest* web_view_guest() const { return web_view_guest_; } 50 extensions::WebViewGuest* web_view_guest() const { return web_view_guest_; }
51 51
52 private: 52 private:
53 content::WebContents* guest_web_contents() const { 53 content::WebContents* guest_web_contents() const {
54 return web_view_guest()->web_contents(); 54 return web_view_guest()->web_contents();
55 } 55 }
56 56
57 // Returns the top level items (ignoring submenus) as Value. 57 // Returns the top level items (ignoring submenus) as Value.
58 static scoped_ptr<base::ListValue> MenuModelToValue( 58 static scoped_ptr<base::ListValue> MenuModelToValue(
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 // This is used to ensure pending tasks will not fire after this object is 91 // This is used to ensure pending tasks will not fire after this object is
92 // destroyed. 92 // destroyed.
93 base::WeakPtrFactory<ChromeWebViewGuestDelegate> weak_ptr_factory_; 93 base::WeakPtrFactory<ChromeWebViewGuestDelegate> weak_ptr_factory_;
94 94
95 DISALLOW_COPY_AND_ASSIGN(ChromeWebViewGuestDelegate); 95 DISALLOW_COPY_AND_ASSIGN(ChromeWebViewGuestDelegate);
96 }; 96 };
97 97
98 #endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_ 98 #endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_
99 99
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698