| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/startup/startup_browser_creator.h" | 5 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 6 | 6 |
| 7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "apps/app_load_service.h" | 10 #include "apps/app_load_service.h" |
| (...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 526 return false; | 526 return false; |
| 527 } | 527 } |
| 528 | 528 |
| 529 if (command_line.HasSwitch(switches::kLimitedInstallFromWebstore)) { | 529 if (command_line.HasSwitch(switches::kLimitedInstallFromWebstore)) { |
| 530 extensions::StartupHelper helper; | 530 extensions::StartupHelper helper; |
| 531 helper.LimitedInstallFromWebstore(command_line, last_used_profile, | 531 helper.LimitedInstallFromWebstore(command_line, last_used_profile, |
| 532 base::Bind(&base::DoNothing)); | 532 base::Bind(&base::DoNothing)); |
| 533 } | 533 } |
| 534 | 534 |
| 535 #if defined(OS_CHROMEOS) | 535 #if defined(OS_CHROMEOS) |
| 536 |
| 537 #if defined(USE_ATHENA) |
| 538 // Athena will never launch browser. |
| 539 silent_launch = true; |
| 540 #endif |
| 541 |
| 536 // The browser will be launched after the user logs in. | 542 // The browser will be launched after the user logs in. |
| 537 if (command_line.HasSwitch(chromeos::switches::kLoginManager)) | 543 if (command_line.HasSwitch(chromeos::switches::kLoginManager)) |
| 538 silent_launch = true; | 544 silent_launch = true; |
| 539 | 545 |
| 540 if (chrome::IsRunningInAppMode() && | 546 if (chrome::IsRunningInAppMode() && |
| 541 command_line.HasSwitch(switches::kAppId)) { | 547 command_line.HasSwitch(switches::kAppId)) { |
| 542 chromeos::LaunchAppOrDie( | 548 chromeos::LaunchAppOrDie( |
| 543 last_used_profile, | 549 last_used_profile, |
| 544 command_line.GetSwitchValueASCII(switches::kAppId)); | 550 command_line.GetSwitchValueASCII(switches::kAppId)); |
| 545 | 551 |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 // If we are showing the app list then chrome isn't shown so load the app | 742 // If we are showing the app list then chrome isn't shown so load the app |
| 737 // list's profile rather than chrome's. | 743 // list's profile rather than chrome's. |
| 738 if (command_line.HasSwitch(switches::kShowAppList)) { | 744 if (command_line.HasSwitch(switches::kShowAppList)) { |
| 739 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> | 745 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> |
| 740 GetProfilePath(user_data_dir); | 746 GetProfilePath(user_data_dir); |
| 741 } | 747 } |
| 742 | 748 |
| 743 return g_browser_process->profile_manager()->GetLastUsedProfileDir( | 749 return g_browser_process->profile_manager()->GetLastUsedProfileDir( |
| 744 user_data_dir); | 750 user_data_dir); |
| 745 } | 751 } |
| OLD | NEW |