| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/browser_shutdown.h" | 5 #include "chrome/browser/browser_shutdown.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 ResourceBundle::CleanupSharedInstance(); | 157 ResourceBundle::CleanupSharedInstance(); |
| 158 | 158 |
| 159 #if defined(OS_WIN) | 159 #if defined(OS_WIN) |
| 160 if (!Upgrade::IsBrowserAlreadyRunning() && | 160 if (!Upgrade::IsBrowserAlreadyRunning() && |
| 161 shutdown_type_ != browser_shutdown::END_SESSION) { | 161 shutdown_type_ != browser_shutdown::END_SESSION) { |
| 162 Upgrade::SwapNewChromeExeIfPresent(); | 162 Upgrade::SwapNewChromeExeIfPresent(); |
| 163 } | 163 } |
| 164 #endif | 164 #endif |
| 165 | 165 |
| 166 if (restart_last_session) { | 166 if (restart_last_session) { |
| 167 #if defined(OS_WIN) || defined(OS_LINUX) | 167 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| 168 // Make sure to relaunch the browser with the same command line and add | 168 // Make sure to relaunch the browser with the same command line and add |
| 169 // Restore Last Session flag if session restore is not set. | 169 // Restore Last Session flag if session restore is not set. |
| 170 CommandLine command_line(*CommandLine::ForCurrentProcess()); | 170 CommandLine command_line(*CommandLine::ForCurrentProcess()); |
| 171 if (!command_line.HasSwitch(switches::kRestoreLastSession)) | 171 if (!command_line.HasSwitch(switches::kRestoreLastSession)) |
| 172 command_line.AppendSwitch(switches::kRestoreLastSession); | 172 command_line.AppendSwitch(switches::kRestoreLastSession); |
| 173 Upgrade::RelaunchChromeBrowser(command_line); | 173 Upgrade::RelaunchChromeBrowser(command_line); |
| 174 #else | 174 #else |
| 175 NOTIMPLEMENTED(); | 175 NOTIMPLEMENTED(); |
| 176 #endif | 176 #endif |
| 177 } | 177 } |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 void SetTryingToQuit(bool quitting) { | 257 void SetTryingToQuit(bool quitting) { |
| 258 g_trying_to_quit = quitting; | 258 g_trying_to_quit = quitting; |
| 259 } | 259 } |
| 260 | 260 |
| 261 bool IsTryingToQuit() { | 261 bool IsTryingToQuit() { |
| 262 return g_trying_to_quit; | 262 return g_trying_to_quit; |
| 263 } | 263 } |
| 264 #endif | 264 #endif |
| 265 | 265 |
| 266 } // namespace browser_shutdown | 266 } // namespace browser_shutdown |
| OLD | NEW |