ui/views/aura_desktop/aura_desktop_main.cc - 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: ui/views/aura_desktop/aura_desktop_main.cc

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: ui/views/aura_desktop/aura_desktop_main.cc

diff --git a/ui/views/aura_desktop/aura_desktop_main.cc b/ui/views/aura_desktop/aura_desktop_main.cc

index 1e12b08ff149206e255222e595eef502921c6ad4..4fb47e5998021350e7d0c906de5097303ac9d846 100644

--- a/ui/views/aura_desktop/aura_desktop_main.cc

+++ b/ui/views/aura_desktop/aura_desktop_main.cc

@@ -30,6 +30,7 @@ class DemoWindowDelegate : public aura::WindowDelegate {

explicit DemoWindowDelegate(SkColor color) : color_(color) {}

// 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) OVERRIDE {}

virtual void OnFocus() OVERRIDE {}