| Index: chrome/browser/lifetime/browser_close_manager.cc
|
| diff --git a/chrome/browser/lifetime/browser_close_manager.cc b/chrome/browser/lifetime/browser_close_manager.cc
|
| index 0f46a01214e784d42158c81bb86e78a1ed56ed55..13982f1d77a019121f3b8170631caac25894e6bd 100644
|
| --- a/chrome/browser/lifetime/browser_close_manager.cc
|
| +++ b/chrome/browser/lifetime/browser_close_manager.cc
|
| @@ -4,14 +4,11 @@
|
|
|
| #include "chrome/browser/lifetime/browser_close_manager.h"
|
|
|
| -#include "base/prefs/pref_service.h"
|
| #include "chrome/browser/background/background_mode_manager.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/browser_shutdown.h"
|
| #include "chrome/browser/download/download_service.h"
|
| #include "chrome/browser/download/download_service_factory.h"
|
| -#include "chrome/browser/first_run/upgrade_util.h"
|
| -#include "chrome/browser/lifetime/application_lifetime.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_iterator.h"
|
| @@ -20,14 +17,8 @@
|
| #include "chrome/browser/ui/chrome_pages.h"
|
| #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| -#include "chrome/common/pref_names.h"
|
| #include "content/public/browser/web_contents.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "base/win/windows_version.h"
|
| -#include "chrome/browser/first_run/upgrade_util_win.h"
|
| -#endif
|
| -
|
| BrowserCloseManager::BrowserCloseManager() : current_browser_(NULL) {}
|
|
|
| BrowserCloseManager::~BrowserCloseManager() {}
|
| @@ -169,17 +160,4 @@ void BrowserCloseManager::CloseBrowsers() {
|
| }
|
| }
|
| }
|
| -
|
| -#if defined(OS_WIN)
|
| - if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
|
| - PrefService* pref_service = g_browser_process->local_state();
|
| - bool is_relaunch = pref_service->GetBoolean(prefs::kWasRestarted);
|
| - if (is_relaunch) {
|
| - upgrade_util::RelaunchMode mode = upgrade_util::RelaunchModeStringToEnum(
|
| - pref_service->GetString(prefs::kRelaunchMode));
|
| - if (mode == upgrade_util::RELAUNCH_MODE_DESKTOP)
|
| - chrome::ActivateDesktopHelper(chrome::ASH_TERMINATE);
|
| - }
|
| - }
|
| -#endif
|
| }
|
|
|