chrome/browser/sessions/session_restore.cc - Issue 11343028: Revert 164652 - speculative revert - this change may have caused print dialog test failures on XP.

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: chrome/browser/sessions/session_restore.cc

Issue 11343028: Revert 164652 - speculative revert - this change may have caused print dialog test failures on XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/prefs/pref_service_browsertest.cc ('k') | chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sessions/session_restore.cc

===================================================================

--- chrome/browser/sessions/session_restore.cc (revision 164764)

+++ chrome/browser/sessions/session_restore.cc (working copy)

@@ -57,9 +57,6 @@

#include "base/win/metro.h"

#endif

-#if defined(USE_ASH)

-#include "ash/wm/window_util.h"

-#endif

using content::NavigationController;

using content::RenderWidgetHost;

using content::WebContents;

@@ -1023,16 +1020,7 @@

if (browser_ == browser)

return;

-#if defined(USE_ASH)

- // Prevent the auto window management for this window on show.

- ash::wm::SetUserHasChangedWindowPositionOrSize(

- browser->window()->GetNativeWindow(), true);

-#endif

browser->window()->Show();

-#if defined(USE_ASH)

- ash::wm::SetUserHasChangedWindowPositionOrSize(

- browser->window()->GetNativeWindow(), false);

-#endif

browser->set_is_session_restore(false);

// TODO(jcampan): http://crbug.com/8123 we should not need to set the