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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.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 (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_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, 219 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
220 const SkBitmap& zoomed_bitmap) override; 220 const SkBitmap& zoomed_bitmap) override;
221 bool LockMouse() override; 221 bool LockMouse() override;
222 void UnlockMouse() override; 222 void UnlockMouse() override;
223 void OnSwapCompositorFrame(uint32 output_surface_id, 223 void OnSwapCompositorFrame(uint32 output_surface_id,
224 scoped_ptr<cc::CompositorFrame> frame) override; 224 scoped_ptr<cc::CompositorFrame> frame) override;
225 void DidStopFlinging() override; 225 void DidStopFlinging() override;
226 void OnDidNavigateMainFrameToNewPage() override; 226 void OnDidNavigateMainFrameToNewPage() override;
227 227
228 #if defined(OS_WIN) 228 #if defined(OS_WIN)
229 virtual void SetParentNativeViewAccessible( 229 void SetParentNativeViewAccessible(
230 gfx::NativeViewAccessible accessible_parent) override; 230 gfx::NativeViewAccessible accessible_parent) override;
231 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override; 231 gfx::NativeViewId GetParentForWindowlessPlugin() const override;
232 #endif 232 #endif
233 233
234 // Overridden from ui::TextInputClient: 234 // Overridden from ui::TextInputClient:
235 void SetCompositionText(const ui::CompositionText& composition) override; 235 void SetCompositionText(const ui::CompositionText& composition) override;
236 void ConfirmCompositionText() override; 236 void ConfirmCompositionText() override;
237 void ClearCompositionText() override; 237 void ClearCompositionText() override;
238 void InsertText(const base::string16& text) override; 238 void InsertText(const base::string16& text) override;
239 void InsertChar(base::char16 ch, int flags) override; 239 void InsertChar(base::char16 ch, int flags) override;
240 gfx::NativeWindow GetAttachedWindow() const override; 240 gfx::NativeWindow GetAttachedWindow() const override;
241 ui::TextInputType GetTextInputType() const override; 241 ui::TextInputType GetTextInputType() const override;
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 // compositing surface and showing the disambiguation popup. 670 // compositing surface and showing the disambiguation popup.
671 gfx::Vector2dF disambiguation_scroll_offset_; 671 gfx::Vector2dF disambiguation_scroll_offset_;
672 672
673 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 673 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
674 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 674 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
675 }; 675 };
676 676
677 } // namespace content 677 } // namespace content
678 678
679 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 679 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698