Revert 164652 - speculative revert - this change may have caused print dialog test failures on XP.

chrome/browser/sessions/session_restore.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <string>
@@ skipping 39 matching lines @@
 #include "webkit/glue/glue_serialize.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #endif
 
 #if defined(OS_WIN)
 #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;
 
 namespace {
 
 class SessionRestoreImpl;
 class TabLoader;
 
 TabLoader* shared_tab_loader = NULL;
@@ skipping 943 matching lines @@
   }
 
   void ShowBrowser(Browser* browser, int selected_tab_index) {
     DCHECK(browser);
     DCHECK(browser->tab_count());
     chrome::ActivateTabAt(browser, selected_tab_index, true);
 
     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
     //                initial focus explicitly.
     chrome::GetActiveWebContents(browser)->GetView()->SetInitialFocus();
 
     if (!browser_shown_) {
       browser_shown_ = true;
       base::TimeDelta time_to_first_show =
           base::TimeTicks::Now() - restore_started_;
@@ skipping 138 matching lines @@
   if (active_session_restorers == NULL)
     return false;
   for (std::set<SessionRestoreImpl*>::const_iterator it =
            active_session_restorers->begin();
        it != active_session_restorers->end(); ++it) {
     if ((*it)->profile() == profile)
       return true;
   }
   return false;
 }