OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/message_window.h" | 5 #include "chrome/browser/message_window.h" |
6 | 6 |
7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/process_util.h" | 9 #include "base/process_util.h" |
10 #include "base/win_util.h" | 10 #include "base/win_util.h" |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 FilePath user_data_dir; | 202 FilePath user_data_dir; |
203 PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); | 203 PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); |
204 ProfileManager* profile_manager = g_browser_process->profile_manager(); | 204 ProfileManager* profile_manager = g_browser_process->profile_manager(); |
205 Profile* profile = profile_manager->GetDefaultProfile(user_data_dir); | 205 Profile* profile = profile_manager->GetDefaultProfile(user_data_dir); |
206 if (!profile) { | 206 if (!profile) { |
207 // We should only be able to get here if the profile already exists and | 207 // We should only be able to get here if the profile already exists and |
208 // has been created. | 208 // has been created. |
209 NOTREACHED(); | 209 NOTREACHED(); |
210 return TRUE; | 210 return TRUE; |
211 } | 211 } |
212 BrowserInit::ProcessCommandLine(cur_dir, prefs, false, profile, NULL); | 212 |
| 213 // Run the browser startup sequence again, with the command line of the |
| 214 // signalling process. |
| 215 BrowserInit::ProcessCommandLine(parsed_command_line, cur_dir, prefs, false, |
| 216 profile, NULL); |
213 return TRUE; | 217 return TRUE; |
214 } | 218 } |
215 return TRUE; | 219 return TRUE; |
216 } | 220 } |
217 | 221 |
218 LRESULT CALLBACK MessageWindow::WndProc(HWND hwnd, UINT message, | 222 LRESULT CALLBACK MessageWindow::WndProc(HWND hwnd, UINT message, |
219 WPARAM wparam, LPARAM lparam) { | 223 WPARAM wparam, LPARAM lparam) { |
220 switch (message) { | 224 switch (message) { |
221 case WM_COPYDATA: | 225 case WM_COPYDATA: |
222 return OnCopyData(reinterpret_cast<HWND>(wparam), | 226 return OnCopyData(reinterpret_cast<HWND>(wparam), |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 return true; | 278 return true; |
275 } | 279 } |
276 | 280 |
277 protected: | 281 protected: |
278 std::vector<uint32> browsers_; | 282 std::vector<uint32> browsers_; |
279 }; | 283 }; |
280 | 284 |
281 ZombieDetector zombie_detector; | 285 ZombieDetector zombie_detector; |
282 base::KillProcesses(L"chrome.exe", ResultCodes::HUNG, &zombie_detector); | 286 base::KillProcesses(L"chrome.exe", ResultCodes::HUNG, &zombie_detector); |
283 } | 287 } |
OLD | NEW |