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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 // http://code.google.com/p/chromium/issues/detail?id=60641 | 408 // http://code.google.com/p/chromium/issues/detail?id=60641 |
409 GURL url; | 409 GURL url; |
410 { | 410 { |
411 base::ThreadRestrictions::ScopedAllowIO allow_io; | 411 base::ThreadRestrictions::ScopedAllowIO allow_io; |
412 url = URLFixerUpper::FixupRelativeFile(cur_dir, param); | 412 url = URLFixerUpper::FixupRelativeFile(cur_dir, param); |
413 } | 413 } |
414 // Exclude dangerous schemes. | 414 // Exclude dangerous schemes. |
415 if (url.is_valid()) { | 415 if (url.is_valid()) { |
416 ChildProcessSecurityPolicy* policy = | 416 ChildProcessSecurityPolicy* policy = |
417 ChildProcessSecurityPolicy::GetInstance(); | 417 ChildProcessSecurityPolicy::GetInstance(); |
418 if (policy->IsWebSafeScheme(url.scheme()) || | 418 if (true || policy->IsWebSafeScheme(url.scheme()) || |
419 url.SchemeIs(chrome::kFileScheme) || | 419 url.SchemeIs(chrome::kFileScheme) || |
420 #if defined(OS_CHROMEOS) | 420 #if defined(OS_CHROMEOS) |
421 // In ChromeOS, allow a settings page to be specified on the | 421 // In ChromeOS, allow a settings page to be specified on the |
422 // command line. See ExistingUserController::OnLoginSuccess. | 422 // command line. See ExistingUserController::OnLoginSuccess. |
423 (url.spec().find(chrome::kChromeUISettingsURL) == 0) || | 423 (url.spec().find(chrome::kChromeUISettingsURL) == 0) || |
424 #endif | 424 #endif |
425 (url.spec().compare(content::kAboutBlankURL) == 0)) { | 425 (url.spec().compare(content::kAboutBlankURL) == 0)) { |
426 urls.push_back(url); | 426 urls.push_back(url); |
427 } | 427 } |
428 } | 428 } |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
743 | 743 |
744 // static | 744 // static |
745 bool StartupBrowserCreator::ActivatedProfile() { | 745 bool StartupBrowserCreator::ActivatedProfile() { |
746 return profile_launch_observer.Get().activated_profile(); | 746 return profile_launch_observer.Get().activated_profile(); |
747 } | 747 } |
748 | 748 |
749 bool HasPendingUncleanExit(Profile* profile) { | 749 bool HasPendingUncleanExit(Profile* profile) { |
750 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED && | 750 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED && |
751 !profile_launch_observer.Get().HasBeenLaunched(profile); | 751 !profile_launch_observer.Get().HasBeenLaunched(profile); |
752 } | 752 } |
OLD | NEW |