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

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

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 // 'about' if the browser was started with a about:foo argument. 431 // 'about' if the browser was started with a about:foo argument.
432 if (!url.is_valid()) { 432 if (!url.is_valid()) {
433 base::ThreadRestrictions::ScopedAllowIO allow_io; 433 base::ThreadRestrictions::ScopedAllowIO allow_io;
434 url = URLFixerUpper::FixupRelativeFile(cur_dir, param); 434 url = URLFixerUpper::FixupRelativeFile(cur_dir, param);
435 } 435 }
436 // Exclude dangerous schemes. 436 // Exclude dangerous schemes.
437 if (url.is_valid()) { 437 if (url.is_valid()) {
438 ChildProcessSecurityPolicy* policy = 438 ChildProcessSecurityPolicy* policy =
439 ChildProcessSecurityPolicy::GetInstance(); 439 ChildProcessSecurityPolicy::GetInstance();
440 if (policy->IsWebSafeScheme(url.scheme()) || 440 if (policy->IsWebSafeScheme(url.scheme()) ||
441 url.SchemeIs(content::kFileScheme) || 441 url.SchemeIs(url::kFileScheme) ||
442 #if defined(OS_CHROMEOS) 442 #if defined(OS_CHROMEOS)
443 // In ChromeOS, allow a settings page to be specified on the 443 // In ChromeOS, allow a settings page to be specified on the
444 // command line. See ExistingUserController::OnLoginSuccess. 444 // command line. See ExistingUserController::OnLoginSuccess.
445 (url.spec().find(chrome::kChromeUISettingsURL) == 0) || 445 (url.spec().find(chrome::kChromeUISettingsURL) == 0) ||
446 #endif 446 #endif
447 (url.spec().compare(content::kAboutBlankURL) == 0)) { 447 (url.spec().compare(content::kAboutBlankURL) == 0)) {
448 urls.push_back(url); 448 urls.push_back(url);
449 } 449 }
450 } 450 }
451 } 451 }
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 } 728 }
729 729
730 if (command_line.HasSwitch(switches::kProfileDirectory)) { 730 if (command_line.HasSwitch(switches::kProfileDirectory)) {
731 return user_data_dir.Append( 731 return user_data_dir.Append(
732 command_line.GetSwitchValuePath(switches::kProfileDirectory)); 732 command_line.GetSwitchValuePath(switches::kProfileDirectory));
733 } 733 }
734 734
735 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 735 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
736 user_data_dir); 736 user_data_dir);
737 } 737 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698