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 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1365 // Always add the --views-desktop flag, if not already set. | 1365 // Always add the --views-desktop flag, if not already set. |
1366 if (!parsed_command_line().HasSwitch(switches::kViewsDesktop)) | 1366 if (!parsed_command_line().HasSwitch(switches::kViewsDesktop)) |
1367 CommandLine::ForCurrentProcess()->AppendSwitch(switches::kViewsDesktop); | 1367 CommandLine::ForCurrentProcess()->AppendSwitch(switches::kViewsDesktop); |
1368 #endif | 1368 #endif |
1369 | 1369 |
1370 #if defined(USE_AURA) && defined(OS_CHROMEOS) | 1370 #if defined(USE_AURA) && defined(OS_CHROMEOS) |
1371 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) | 1371 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) |
1372 aura::Desktop::set_use_fullscreen_host_window(true); | 1372 aura::Desktop::set_use_fullscreen_host_window(true); |
1373 #endif | 1373 #endif |
1374 | 1374 |
1375 // Always add the --block-reading-third-party-cookies flag, if not already | |
1376 // set. We'll leave this on for a bit to determine if we Break The Web for | |
1377 // Canary users. | |
1378 // | |
1379 // TODO(mkwst): Remove this once impact is clear (http://crbug.com/98241). | |
1380 if (!parsed_command_line().HasSwitch( | |
1381 switches::kBlockReadingThirdPartyCookies)) | |
1382 CommandLine::ForCurrentProcess()->AppendSwitch( | |
1383 switches::kBlockReadingThirdPartyCookies); | |
1384 | |
1385 // Convert active labs into switches. Modifies the current command line. | 1375 // Convert active labs into switches. Modifies the current command line. |
1386 about_flags::ConvertFlagsToSwitches(local_state, | 1376 about_flags::ConvertFlagsToSwitches(local_state, |
1387 CommandLine::ForCurrentProcess()); | 1377 CommandLine::ForCurrentProcess()); |
1388 | 1378 |
1389 // Reset the command line in the crash report details, since we may have | 1379 // Reset the command line in the crash report details, since we may have |
1390 // just changed it to include experiments. | 1380 // just changed it to include experiments. |
1391 child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); | 1381 child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); |
1392 | 1382 |
1393 InitializeNetworkOptions(parsed_command_line()); | 1383 InitializeNetworkOptions(parsed_command_line()); |
1394 InitializeURLRequestThrottlerManager(browser_process_->net_log()); | 1384 InitializeURLRequestThrottlerManager(browser_process_->net_log()); |
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2138 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && | 2128 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && |
2139 (pre_read == "0" || pre_read == "1")) { | 2129 (pre_read == "0" || pre_read == "1")) { |
2140 std::string uma_name(name); | 2130 std::string uma_name(name); |
2141 uma_name += "_PreRead"; | 2131 uma_name += "_PreRead"; |
2142 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; | 2132 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; |
2143 AddPreReadHistogramTime(uma_name.c_str(), time); | 2133 AddPreReadHistogramTime(uma_name.c_str(), time); |
2144 } | 2134 } |
2145 #endif | 2135 #endif |
2146 #endif | 2136 #endif |
2147 } | 2137 } |
OLD | NEW |