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

Side by Side Diff: android_webview/browser/renderer_host/aw_render_view_host_ext.h

Issue 623833003: replace OVERRIDE and FINAL with override and final in android_webview/ (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 ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
6 #define ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_ 6 #define ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
7 7
8 #include "content/public/browser/web_contents_observer.h" 8 #include "content/public/browser/web_contents_observer.h"
9 9
10 #include "android_webview/common/aw_hit_test_data.h" 10 #include "android_webview/common/aw_hit_test_data.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 void ResetScrollAndScaleState(); 72 void ResetScrollAndScaleState();
73 73
74 // Sets the initial page scale. This overrides initial scale set by 74 // Sets the initial page scale. This overrides initial scale set by
75 // the meta viewport tag. 75 // the meta viewport tag.
76 void SetInitialPageScale(double page_scale_factor); 76 void SetInitialPageScale(double page_scale_factor);
77 void SetBackgroundColor(SkColor c); 77 void SetBackgroundColor(SkColor c);
78 void SetJsOnlineProperty(bool network_up); 78 void SetJsOnlineProperty(bool network_up);
79 79
80 private: 80 private:
81 // content::WebContentsObserver implementation. 81 // content::WebContentsObserver implementation.
82 virtual void RenderViewCreated(content::RenderViewHost* view_host) OVERRIDE; 82 virtual void RenderViewCreated(content::RenderViewHost* view_host) override;
83 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; 83 virtual void RenderProcessGone(base::TerminationStatus status) override;
84 virtual void DidNavigateAnyFrame( 84 virtual void DidNavigateAnyFrame(
85 const content::LoadCommittedDetails& details, 85 const content::LoadCommittedDetails& details,
86 const content::FrameNavigateParams& params) OVERRIDE; 86 const content::FrameNavigateParams& params) override;
87 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 87 virtual bool OnMessageReceived(const IPC::Message& message) override;
88 88
89 void OnDocumentHasImagesResponse(int msg_id, bool has_images); 89 void OnDocumentHasImagesResponse(int msg_id, bool has_images);
90 void OnUpdateHitTestData(const AwHitTestData& hit_test_data); 90 void OnUpdateHitTestData(const AwHitTestData& hit_test_data);
91 void OnPageScaleFactorChanged(float page_scale_factor); 91 void OnPageScaleFactorChanged(float page_scale_factor);
92 void OnContentsSizeChanged(const gfx::Size& contents_size); 92 void OnContentsSizeChanged(const gfx::Size& contents_size);
93 93
94 bool IsRenderViewReady() const; 94 bool IsRenderViewReady() const;
95 95
96 AwRenderViewHostExtClient* client_; 96 AwRenderViewHostExtClient* client_;
97 97
98 SkColor background_color_; 98 SkColor background_color_;
99 99
100 std::map<int, DocumentHasImagesResult> pending_document_has_images_requests_; 100 std::map<int, DocumentHasImagesResult> pending_document_has_images_requests_;
101 101
102 // Master copy of hit test data on the browser side. This is updated 102 // Master copy of hit test data on the browser side. This is updated
103 // as a result of DoHitTest called explicitly or when the FocusedNodeChanged 103 // as a result of DoHitTest called explicitly or when the FocusedNodeChanged
104 // is called in AwRenderViewExt. 104 // is called in AwRenderViewExt.
105 AwHitTestData last_hit_test_data_; 105 AwHitTestData last_hit_test_data_;
106 106
107 bool has_new_hit_test_data_; 107 bool has_new_hit_test_data_;
108 108
109 DISALLOW_COPY_AND_ASSIGN(AwRenderViewHostExt); 109 DISALLOW_COPY_AND_ASSIGN(AwRenderViewHostExt);
110 }; 110 };
111 111
112 } // namespace android_webview 112 } // namespace android_webview
113 113
114 #endif // ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_ 114 #endif // ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698