OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser_init.h" | 5 #include "chrome/browser/browser_init.h" |
6 | 6 |
7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
861 TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()))); | 861 TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()))); |
862 } else { | 862 } else { |
863 // This will create a file URL or a regular URL. | 863 // This will create a file URL or a regular URL. |
864 GURL url(URLFixerUpper::FixupRelativeFile(cur_dir_, param)); | 864 GURL url(URLFixerUpper::FixupRelativeFile(cur_dir_, param)); |
865 // Exclude dangerous schemes. | 865 // Exclude dangerous schemes. |
866 if (url.is_valid()) { | 866 if (url.is_valid()) { |
867 ChildProcessSecurityPolicy *policy = | 867 ChildProcessSecurityPolicy *policy = |
868 ChildProcessSecurityPolicy::GetInstance(); | 868 ChildProcessSecurityPolicy::GetInstance(); |
869 if (policy->IsWebSafeScheme(url.scheme()) || | 869 if (policy->IsWebSafeScheme(url.scheme()) || |
870 url.SchemeIs(chrome::kFileScheme) || | 870 url.SchemeIs(chrome::kFileScheme) || |
871 !url.spec().compare(chrome::kAboutBlankURL)) { | 871 #if defined(OS_CHROMEOS) |
| 872 // In ChromeOS, allow a settings page to be specified on the |
| 873 // command line. See ExistingUserController::OnLoginSuccess. |
| 874 (url.spec().find(chrome::kChromeUISettingsURL) == 0) || |
| 875 #endif |
| 876 (url.spec().compare(chrome::kAboutBlankURL) == 0)) { |
872 urls.push_back(url); | 877 urls.push_back(url); |
873 } | 878 } |
874 } | 879 } |
875 } | 880 } |
876 } | 881 } |
877 return urls; | 882 return urls; |
878 } | 883 } |
879 | 884 |
880 void BrowserInit::LaunchWithProfile::AddStartupURLs( | 885 void BrowserInit::LaunchWithProfile::AddStartupURLs( |
881 std::vector<GURL>* startup_urls) const { | 886 std::vector<GURL>* startup_urls) const { |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1024 scoped_refptr<AutomationProviderClass> automation = | 1029 scoped_refptr<AutomationProviderClass> automation = |
1025 new AutomationProviderClass(profile); | 1030 new AutomationProviderClass(profile); |
1026 automation->ConnectToChannel(channel_id); | 1031 automation->ConnectToChannel(channel_id); |
1027 automation->SetExpectedTabCount(expected_tabs); | 1032 automation->SetExpectedTabCount(expected_tabs); |
1028 | 1033 |
1029 AutomationProviderList* list = | 1034 AutomationProviderList* list = |
1030 g_browser_process->InitAutomationProviderList(); | 1035 g_browser_process->InitAutomationProviderList(); |
1031 DCHECK(list); | 1036 DCHECK(list); |
1032 list->AddProvider(automation); | 1037 list->AddProvider(automation); |
1033 } | 1038 } |
OLD | NEW |