content/browser/renderer_host/render_widget_host_view_aura.h - Issue 8363043: Fix the const of HasFocus for aura.

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 8363043: Fix the const of HasFocus for aura. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 9 years, 1 month 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 #pragma once	7 #pragma once

8	8

9 #include <map>	9 #include <map>

10	10

(...skipping 26 matching lines...) Expand all Loading...
37 virtual void DidBecomeSelected() OVERRIDE;	37 virtual void DidBecomeSelected() OVERRIDE;

38 virtual void WasHidden() OVERRIDE;	38 virtual void WasHidden() OVERRIDE;

39 virtual void SetSize(const gfx::Size& size) OVERRIDE;	39 virtual void SetSize(const gfx::Size& size) OVERRIDE;

40 virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;	40 virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;

41 virtual gfx::NativeView GetNativeView() const OVERRIDE;	41 virtual gfx::NativeView GetNativeView() const OVERRIDE;

42 virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;	42 virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;

43 virtual void MovePluginWindows(	43 virtual void MovePluginWindows(

44 const std::vector<webkit::npapi::WebPluginGeometry>& moves) OVERRIDE;	44 const std::vector<webkit::npapi::WebPluginGeometry>& moves) OVERRIDE;

45 virtual void Focus() OVERRIDE;	45 virtual void Focus() OVERRIDE;

46 virtual void Blur() OVERRIDE;	46 virtual void Blur() OVERRIDE;

47 virtual bool HasFocus() OVERRIDE;	47 virtual bool HasFocus() OVERRIDE const;
	Hironori Bono 2011/10/27 10:51:30 nit: I prefer 'const OVERRIDE' to 'OVERRIDE const' nit: I prefer 'const OVERRIDE' to 'OVERRIDE const' for consistency with other declarations. Peter Mayo 2011/10/27 10:54:55 Done. Show quoted text On 2011/10/27 10:51:30, hbono wrote: > nit: I prefer 'const OVERRIDE' to 'OVERRIDE const' for consistency with other > declarations. Done.
48 virtual void Show() OVERRIDE;	48 virtual void Show() OVERRIDE;

49 virtual void Hide() OVERRIDE;	49 virtual void Hide() OVERRIDE;

50 virtual bool IsShowing() OVERRIDE;	50 virtual bool IsShowing() OVERRIDE;

51 virtual gfx::Rect GetViewBounds() const OVERRIDE;	51 virtual gfx::Rect GetViewBounds() const OVERRIDE;

52 virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;	52 virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;

53 virtual void SetIsLoading(bool is_loading) OVERRIDE;	53 virtual void SetIsLoading(bool is_loading) OVERRIDE;

54 virtual void TextInputStateChanged(ui::TextInputType type,	54 virtual void TextInputStateChanged(ui::TextInputType type,

55 bool can_compose_inline) OVERRIDE;	55 bool can_compose_inline) OVERRIDE;

56 virtual void ImeCancelComposition() OVERRIDE;	56 virtual void ImeCancelComposition() OVERRIDE;

57 virtual void DidUpdateBackingStore(	57 virtual void DidUpdateBackingStore(

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
138 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_;	138 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_;

139	139

140 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> >	140 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> >

141 accelerated_surface_containers_;	141 accelerated_surface_containers_;

142 #endif	142 #endif

143	143

144 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);	144 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);

145 };	145 };

146	146

147 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_	147 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_

OLD	NEW