Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator.cc

Issue 120593003: Move kFileScheme constant into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 GURL url; 429 GURL url;
430 { 430 {
431 base::ThreadRestrictions::ScopedAllowIO allow_io; 431 base::ThreadRestrictions::ScopedAllowIO allow_io;
432 url = URLFixerUpper::FixupRelativeFile(cur_dir, param); 432 url = URLFixerUpper::FixupRelativeFile(cur_dir, param);
433 } 433 }
434 // Exclude dangerous schemes. 434 // Exclude dangerous schemes.
435 if (url.is_valid()) { 435 if (url.is_valid()) {
436 ChildProcessSecurityPolicy* policy = 436 ChildProcessSecurityPolicy* policy =
437 ChildProcessSecurityPolicy::GetInstance(); 437 ChildProcessSecurityPolicy::GetInstance();
438 if (policy->IsWebSafeScheme(url.scheme()) || 438 if (policy->IsWebSafeScheme(url.scheme()) ||
439 url.SchemeIs(chrome::kFileScheme) || 439 url.SchemeIs(content::kFileScheme) ||
440 #if defined(OS_CHROMEOS) 440 #if defined(OS_CHROMEOS)
441 // In ChromeOS, allow a settings page to be specified on the 441 // In ChromeOS, allow a settings page to be specified on the
442 // command line. See ExistingUserController::OnLoginSuccess. 442 // command line. See ExistingUserController::OnLoginSuccess.
443 (url.spec().find(chrome::kChromeUISettingsURL) == 0) || 443 (url.spec().find(chrome::kChromeUISettingsURL) == 0) ||
444 #endif 444 #endif
445 (url.spec().compare(content::kAboutBlankURL) == 0)) { 445 (url.spec().compare(content::kAboutBlankURL) == 0)) {
446 urls.push_back(url); 446 urls.push_back(url);
447 } 447 }
448 } 448 }
449 } 449 }
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 787
788 // static 788 // static
789 bool StartupBrowserCreator::ActivatedProfile() { 789 bool StartupBrowserCreator::ActivatedProfile() {
790 return profile_launch_observer.Get().activated_profile(); 790 return profile_launch_observer.Get().activated_profile();
791 } 791 }
792 792
793 bool HasPendingUncleanExit(Profile* profile) { 793 bool HasPendingUncleanExit(Profile* profile) {
794 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED && 794 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
795 !profile_launch_observer.Get().HasBeenLaunched(profile); 795 !profile_launch_observer.Get().HasBeenLaunched(profile);
796 } 796 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/drag_util.mm ('k') | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698