OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 ResourceBundle::GetSharedInstance().LoadThemeResources(); | 452 ResourceBundle::GetSharedInstance().LoadThemeResources(); |
453 } | 453 } |
454 #endif // !defined(OS_MACOSX) | 454 #endif // !defined(OS_MACOSX) |
455 | 455 |
456 #if defined(OS_LINUX) | 456 #if defined(OS_LINUX) |
457 gtk_util::SetDefaultWindowIcon(); | 457 gtk_util::SetDefaultWindowIcon(); |
458 #endif | 458 #endif |
459 | 459 |
460 #if defined(OS_WIN) | 460 #if defined(OS_WIN) |
461 // This is experimental code. See first_run_win.cc for more info. | 461 // This is experimental code. See first_run_win.cc for more info. |
462 if (parsed_command_line.HasSwitch(switches::kTryChromeAgain)) { | 462 std::wstring try_chrome = |
463 Upgrade::TryResult answer = Upgrade::ShowTryChromeDialog(); | 463 parsed_command_line.GetSwitchValue(switches::kTryChromeAgain); |
| 464 if (!try_chrome.empty()) { |
| 465 Upgrade::TryResult answer = |
| 466 Upgrade::ShowTryChromeDialog(StringToInt(try_chrome)); |
464 if (answer == Upgrade::TD_NOT_NOW) | 467 if (answer == Upgrade::TD_NOT_NOW) |
465 return ResultCodes::NORMAL_EXIT_EXP1; | 468 return ResultCodes::NORMAL_EXIT_EXP1; |
466 if (answer == Upgrade::TD_UNINSTALL_CHROME) | 469 if (answer == Upgrade::TD_UNINSTALL_CHROME) |
467 return ResultCodes::NORMAL_EXIT_EXP2; | 470 return ResultCodes::NORMAL_EXIT_EXP2; |
468 } | 471 } |
469 #endif // OS_WIN | 472 #endif // OS_WIN |
470 | 473 |
471 BrowserInit browser_init; | 474 BrowserInit browser_init; |
472 | 475 |
473 int rlz_ping_delay = 0; | 476 int rlz_ping_delay = 0; |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
841 if (metrics) | 844 if (metrics) |
842 metrics->Stop(); | 845 metrics->Stop(); |
843 | 846 |
844 // browser_shutdown takes care of deleting browser_process, so we need to | 847 // browser_shutdown takes care of deleting browser_process, so we need to |
845 // release it. | 848 // release it. |
846 browser_process.release(); | 849 browser_process.release(); |
847 browser_shutdown::Shutdown(); | 850 browser_shutdown::Shutdown(); |
848 | 851 |
849 return result_code; | 852 return result_code; |
850 } | 853 } |
OLD | NEW |