| 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 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1020 if (command_line.HasSwitch(switches::kChromeFrame)) { | 1020 if (command_line.HasSwitch(switches::kChromeFrame)) { |
| 1021 CreateAutomationProvider<ChromeFrameAutomationProvider>( | 1021 CreateAutomationProvider<ChromeFrameAutomationProvider>( |
| 1022 automation_channel_id, profile, expected_tabs); | 1022 automation_channel_id, profile, expected_tabs); |
| 1023 } else { | 1023 } else { |
| 1024 CreateAutomationProvider<AutomationProvider>(automation_channel_id, | 1024 CreateAutomationProvider<AutomationProvider>(automation_channel_id, |
| 1025 profile, expected_tabs); | 1025 profile, expected_tabs); |
| 1026 } | 1026 } |
| 1027 } | 1027 } |
| 1028 | 1028 |
| 1029 if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) { | 1029 if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) { |
| 1030 std::wstring allowed_ports = | 1030 std::string allowed_ports = |
| 1031 command_line.GetSwitchValue(switches::kExplicitlyAllowedPorts); | 1031 command_line.GetSwitchValueASCII(switches::kExplicitlyAllowedPorts); |
| 1032 net::SetExplicitlyAllowedPorts(allowed_ports); | 1032 net::SetExplicitlyAllowedPorts(allowed_ports); |
| 1033 } | 1033 } |
| 1034 | 1034 |
| 1035 #if defined(OS_CHROMEOS) | 1035 #if defined(OS_CHROMEOS) |
| 1036 // The browser will be launched after the user logs in. | 1036 // The browser will be launched after the user logs in. |
| 1037 if (command_line.HasSwitch(switches::kLoginManager)) | 1037 if (command_line.HasSwitch(switches::kLoginManager)) |
| 1038 silent_launch = true; | 1038 silent_launch = true; |
| 1039 #endif | 1039 #endif |
| 1040 | 1040 |
| 1041 // If we don't want to launch a new browser window or tab (in the case | 1041 // If we don't want to launch a new browser window or tab (in the case |
| (...skipping 12 matching lines...) Expand all Loading... |
| 1054 scoped_refptr<AutomationProviderClass> automation = | 1054 scoped_refptr<AutomationProviderClass> automation = |
| 1055 new AutomationProviderClass(profile); | 1055 new AutomationProviderClass(profile); |
| 1056 automation->ConnectToChannel(channel_id); | 1056 automation->ConnectToChannel(channel_id); |
| 1057 automation->SetExpectedTabCount(expected_tabs); | 1057 automation->SetExpectedTabCount(expected_tabs); |
| 1058 | 1058 |
| 1059 AutomationProviderList* list = | 1059 AutomationProviderList* list = |
| 1060 g_browser_process->InitAutomationProviderList(); | 1060 g_browser_process->InitAutomationProviderList(); |
| 1061 DCHECK(list); | 1061 DCHECK(list); |
| 1062 list->AddProvider(automation); | 1062 list->AddProvider(automation); |
| 1063 } | 1063 } |
| OLD | NEW |