Elim kRestorePopups

chrome/browser/sessions/session_service.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_service.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 1569 matching lines @@
 }
 
 bool SessionService::should_track_changes_for_browser_type(Browser::Type type,
                                                            AppType app_type) {
 #if defined(OS_CHROMEOS)
   // Restore app popups for chromeos alone.
   if (type == Browser::TYPE_POPUP && app_type == TYPE_APP)
     return true;
 #endif
 
-  return type == Browser::TYPE_TABBED ||
-        (type == Browser::TYPE_POPUP && browser_defaults::kRestorePopups);
+  return type == Browser::TYPE_TABBED;
 }
 
 SessionService::WindowType SessionService::WindowTypeForBrowserType(
     Browser::Type type) {
   switch (type) {
     case Browser::TYPE_POPUP:
       return TYPE_POPUP;
     case Browser::TYPE_TABBED:
       return TYPE_TABBED;
     default:
@@ skipping 203 matching lines @@
     return;
   }
 
   // Check for any open windows for the current profile that we aren't tracking.
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     if ((*it)->profile() == profile())
       return;
   }
   DeleteSessionOnlyData(profile());
 }