OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1594 // grab a token and register with the policy server. | 1594 // grab a token and register with the policy server. |
1595 // TODO(mnissler): Remove once OAuth is the only authentication mechanism. | 1595 // TODO(mnissler): Remove once OAuth is the only authentication mechanism. |
1596 if (parsed_command_line().HasSwitch(switches::kLoginUser) && | 1596 if (parsed_command_line().HasSwitch(switches::kLoginUser) && |
1597 !parsed_command_line().HasSwitch(switches::kLoginPassword)) { | 1597 !parsed_command_line().HasSwitch(switches::kLoginPassword)) { |
1598 g_browser_process->browser_policy_connector()->SetUserPolicyTokenService( | 1598 g_browser_process->browser_policy_connector()->SetUserPolicyTokenService( |
1599 profile_->GetTokenService()); | 1599 profile_->GetTokenService()); |
1600 } | 1600 } |
1601 | 1601 |
1602 // Tests should be able to tune login manager before showing it. | 1602 // Tests should be able to tune login manager before showing it. |
1603 // Thus only show login manager in normal (non-testing) mode. | 1603 // Thus only show login manager in normal (non-testing) mode. |
1604 if (!parameters().ui_task) | 1604 if (!parameters().ui_task && false) |
Ami GONE FROM CHROMIUM
2011/11/30 00:08:37
Ignore this - not for submission.
| |
1605 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile_); | 1605 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile_); |
1606 #endif | 1606 #endif |
1607 | 1607 |
1608 #if !defined(OS_MACOSX) | 1608 #if !defined(OS_MACOSX) |
1609 // Importing other browser settings is done in a browser-like process | 1609 // Importing other browser settings is done in a browser-like process |
1610 // that exits when this task has finished. | 1610 // that exits when this task has finished. |
1611 // TODO(port): Port the Mac's IPC-based implementation to other platforms to | 1611 // TODO(port): Port the Mac's IPC-based implementation to other platforms to |
1612 // replace this implementation. http://crbug.com/22142 | 1612 // replace this implementation. http://crbug.com/22142 |
1613 if (parsed_command_line().HasSwitch(switches::kImport) || | 1613 if (parsed_command_line().HasSwitch(switches::kImport) || |
1614 parsed_command_line().HasSwitch(switches::kImportFromFile)) { | 1614 parsed_command_line().HasSwitch(switches::kImportFromFile)) { |
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2114 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && | 2114 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && |
2115 (pre_read == "0" || pre_read == "1")) { | 2115 (pre_read == "0" || pre_read == "1")) { |
2116 std::string uma_name(name); | 2116 std::string uma_name(name); |
2117 uma_name += "_PreRead"; | 2117 uma_name += "_PreRead"; |
2118 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; | 2118 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; |
2119 AddPreReadHistogramTime(uma_name.c_str(), time); | 2119 AddPreReadHistogramTime(uma_name.c_str(), time); |
2120 } | 2120 } |
2121 #endif | 2121 #endif |
2122 #endif | 2122 #endif |
2123 } | 2123 } |
OLD | NEW |