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/ui/browser_init.h" | 5 #include "chrome/browser/ui/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 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1030 return false; | 1030 return false; |
1031 } | 1031 } |
1032 } | 1032 } |
1033 | 1033 |
1034 // If we have been invoked to display a desktop notification on behalf of | 1034 // If we have been invoked to display a desktop notification on behalf of |
1035 // the service process, we do not want to open any browser windows. | 1035 // the service process, we do not want to open any browser windows. |
1036 if (command_line.HasSwitch(switches::kNotifyCloudPrintTokenExpired)) { | 1036 if (command_line.HasSwitch(switches::kNotifyCloudPrintTokenExpired)) { |
1037 silent_launch = true; | 1037 silent_launch = true; |
1038 profile->GetCloudPrintProxyService()->ShowTokenExpiredNotification(); | 1038 profile->GetCloudPrintProxyService()->ShowTokenExpiredNotification(); |
1039 } | 1039 } |
1040 // If we are just displaying a print dialog we shouldn't open browser | |
1041 // windows. | |
1042 if (command_line.HasSwitch(switches::kCloudPrintFile)) { | |
sanjeevr
2011/01/13 18:03:41
Here also we should check if there is a path actua
abodenha
2011/01/13 19:03:59
Done.
| |
1043 silent_launch = true; | |
1044 } | |
1045 | |
1040 | 1046 |
1041 if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) { | 1047 if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) { |
1042 std::string allowed_ports = | 1048 std::string allowed_ports = |
1043 command_line.GetSwitchValueASCII(switches::kExplicitlyAllowedPorts); | 1049 command_line.GetSwitchValueASCII(switches::kExplicitlyAllowedPorts); |
1044 net::SetExplicitlyAllowedPorts(allowed_ports); | 1050 net::SetExplicitlyAllowedPorts(allowed_ports); |
1045 } | 1051 } |
1046 | 1052 |
1047 #if defined(OS_CHROMEOS) | 1053 #if defined(OS_CHROMEOS) |
1048 // The browser will be launched after the user logs in. | 1054 // The browser will be launched after the user logs in. |
1049 if (command_line.HasSwitch(switches::kLoginManager) || | 1055 if (command_line.HasSwitch(switches::kLoginManager) || |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1096 return false; | 1102 return false; |
1097 automation->SetExpectedTabCount(expected_tabs); | 1103 automation->SetExpectedTabCount(expected_tabs); |
1098 | 1104 |
1099 AutomationProviderList* list = | 1105 AutomationProviderList* list = |
1100 g_browser_process->InitAutomationProviderList(); | 1106 g_browser_process->InitAutomationProviderList(); |
1101 DCHECK(list); | 1107 DCHECK(list); |
1102 list->AddProvider(automation); | 1108 list->AddProvider(automation); |
1103 | 1109 |
1104 return true; | 1110 return true; |
1105 } | 1111 } |
OLD | NEW |