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 "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
564 std::string allowed_ports = | 564 std::string allowed_ports = |
565 command_line.GetSwitchValueASCII(switches::kExplicitlyAllowedPorts); | 565 command_line.GetSwitchValueASCII(switches::kExplicitlyAllowedPorts); |
566 net::SetExplicitlyAllowedPorts(allowed_ports); | 566 net::SetExplicitlyAllowedPorts(allowed_ports); |
567 } | 567 } |
568 | 568 |
569 if (command_line.HasSwitch(switches::kInstallFromWebstore)) { | 569 if (command_line.HasSwitch(switches::kInstallFromWebstore)) { |
570 extensions::StartupHelper helper; | 570 extensions::StartupHelper helper; |
571 helper.InstallFromWebstore(command_line, last_used_profile); | 571 helper.InstallFromWebstore(command_line, last_used_profile); |
572 // Nothing more needs to be done, so return false to stop launching and | 572 // Nothing more needs to be done, so return false to stop launching and |
573 // quit. | 573 // quit. |
574 return false; | 574 // return false; |
sky
2013/01/31 01:08:17
Fix this. Either remove if (if not needed), or rem
zel
2013/01/31 01:19:44
whoops! this wasn't suppose to be here at all. rev
| |
575 } | 575 } |
576 | 576 |
577 #if defined(OS_CHROMEOS) | 577 #if defined(OS_CHROMEOS) |
578 // The browser will be launched after the user logs in. | 578 // The browser will be launched after the user logs in. |
579 if (command_line.HasSwitch(switches::kLoginManager) || | 579 if (command_line.HasSwitch(switches::kLoginManager) || |
580 command_line.HasSwitch(switches::kLoginPassword)) { | 580 command_line.HasSwitch(switches::kLoginPassword)) { |
581 silent_launch = true; | 581 silent_launch = true; |
582 } | 582 } |
583 #endif | 583 #endif |
584 | 584 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
702 | 702 |
703 // static | 703 // static |
704 bool StartupBrowserCreator::ActivatedProfile() { | 704 bool StartupBrowserCreator::ActivatedProfile() { |
705 return profile_launch_observer.Get().activated_profile(); | 705 return profile_launch_observer.Get().activated_profile(); |
706 } | 706 } |
707 | 707 |
708 bool HasPendingUncleanExit(Profile* profile) { | 708 bool HasPendingUncleanExit(Profile* profile) { |
709 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED && | 709 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED && |
710 !profile_launch_observer.Get().HasBeenLaunched(profile); | 710 !profile_launch_observer.Get().HasBeenLaunched(profile); |
711 } | 711 } |
OLD | NEW |