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

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

Issue 884103004: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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_GUEST_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 const NativeWebKeyboardEvent& event) override; 117 const NativeWebKeyboardEvent& event) override;
118 #endif // defined(OS_MACOSX) 118 #endif // defined(OS_MACOSX)
119 119
120 #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) 120 #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
121 // RenderWidgetHostViewBase implementation. 121 // RenderWidgetHostViewBase implementation.
122 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, 122 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
123 const SkBitmap& zoomed_bitmap) override; 123 const SkBitmap& zoomed_bitmap) override;
124 #endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) 124 #endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
125 125
126 #if defined(OS_ANDROID) 126 #if defined(OS_ANDROID)
127 virtual void LockCompositingSurface() override; 127 void LockCompositingSurface() override;
128 virtual void UnlockCompositingSurface() override; 128 void UnlockCompositingSurface() override;
129 #endif // defined(OS_ANDROID) 129 #endif // defined(OS_ANDROID)
130 130
131 #if defined(OS_WIN) 131 #if defined(OS_WIN)
132 virtual void SetParentNativeViewAccessible( 132 virtual void SetParentNativeViewAccessible(
133 gfx::NativeViewAccessible accessible_parent) override; 133 gfx::NativeViewAccessible accessible_parent) override;
134 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override; 134 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override;
135 #endif 135 #endif
136 136
137 // Overridden from ui::GestureEventHelper. 137 // Overridden from ui::GestureEventHelper.
138 bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override; 138 bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 base::WeakPtr<RenderWidgetHostViewBase> platform_view_; 171 base::WeakPtr<RenderWidgetHostViewBase> platform_view_;
172 #if defined(USE_AURA) 172 #if defined(USE_AURA)
173 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; 173 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_;
174 #endif 174 #endif
175 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest); 175 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest);
176 }; 176 };
177 177
178 } // namespace content 178 } // namespace content
179 179
180 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ 180 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698