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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back out some webrtc files. Created 5 years, 8 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 CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/renderer_host/render_widget_host_view_base.h" 9 #include "content/browser/renderer_host/render_widget_host_view_base.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 const NativeWebKeyboardEvent& event) override; 118 const NativeWebKeyboardEvent& event) override;
119 #endif // defined(OS_MACOSX) 119 #endif // defined(OS_MACOSX)
120 120
121 // RenderWidgetHostViewBase implementation. 121 // RenderWidgetHostViewBase implementation.
122 #if defined(OS_ANDROID) 122 #if defined(OS_ANDROID)
123 void LockCompositingSurface() override; 123 void LockCompositingSurface() override;
124 void UnlockCompositingSurface() override; 124 void UnlockCompositingSurface() override;
125 #endif // defined(OS_ANDROID) 125 #endif // defined(OS_ANDROID)
126 126
127 #if defined(OS_WIN) 127 #if defined(OS_WIN)
128 virtual void SetParentNativeViewAccessible( 128 void SetParentNativeViewAccessible(
129 gfx::NativeViewAccessible accessible_parent) override; 129 gfx::NativeViewAccessible accessible_parent) override;
130 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override; 130 gfx::NativeViewId GetParentForWindowlessPlugin() const override;
131 #endif 131 #endif
132 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( 132 BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
133 BrowserAccessibilityDelegate* delegate) override; 133 BrowserAccessibilityDelegate* delegate) override;
134 134
135 SkColorType PreferredReadbackFormat() override; 135 SkColorType PreferredReadbackFormat() override;
136 136
137 protected: 137 protected:
138 friend class RenderWidgetHostView; 138 friend class RenderWidgetHostView;
139 139
140 // The last scroll offset of the view. 140 // The last scroll offset of the view.
141 gfx::Vector2dF last_scroll_offset_; 141 gfx::Vector2dF last_scroll_offset_;
142 142
143 // Members will become private when RenderWidgetHostViewGuest is removed. 143 // Members will become private when RenderWidgetHostViewGuest is removed.
144 // The model object. 144 // The model object.
145 RenderWidgetHostImpl* host_; 145 RenderWidgetHostImpl* host_;
146 146
147 // frame_connector_ provides a platform abstraction. Messages 147 // frame_connector_ provides a platform abstraction. Messages
148 // sent through it are routed to the embedding renderer process. 148 // sent through it are routed to the embedding renderer process.
149 CrossProcessFrameConnector* frame_connector_; 149 CrossProcessFrameConnector* frame_connector_;
150 150
151 private: 151 private:
152 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 152 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
153 }; 153 };
154 154
155 } // namespace content 155 } // namespace content
156 156
157 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 157 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/interstitial_page_impl.h ('k') | content/browser/frame_host/render_widget_host_view_guest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698