content/browser/renderer_host/render_widget_host_view_aura.h - Issue 8574049: [Aura] Fix HtmlDialogBrowserTest.SizeWindow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 8574049: [Aura] Fix HtmlDialogBrowserTest.SizeWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge 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:

Index: content/browser/renderer_host/render_widget_host_view_aura.h

diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h

index fe77171e06bc06e43315de0eee60c4aaea8b83ec..0e4a5299a0d42fc8e9cf81c7a487a76d7b5c910a 100644

--- a/content/browser/renderer_host/render_widget_host_view_aura.h

+++ b/content/browser/renderer_host/render_widget_host_view_aura.h

@@ -99,8 +99,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAura

virtual void UnlockMouse() OVERRIDE;

// Overridden from aura::WindowDelegate:

+ virtual void OnBoundsChanging(gfx::Rect* new_bounds) OVERRIDE;

virtual void OnBoundsChanged(const gfx::Rect& old_bounds,

- const gfx::Rect& new_bounds);

+ const gfx::Rect& new_bounds) OVERRIDE;

virtual void OnFocus() OVERRIDE;

virtual void OnBlur() OVERRIDE;

virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE;