Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 8060030: Experimentally strictify third-party cookie blocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 // call to ConvertFlagsToSwitches in the following line. 1352 // call to ConvertFlagsToSwitches in the following line.
1353 if (!parsed_command_line().HasSwitch(switches::kViewsDesktop)) 1353 if (!parsed_command_line().HasSwitch(switches::kViewsDesktop))
1354 CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kViewsDesktop, 1354 CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kViewsDesktop,
1355 "other"); 1355 "other");
1356 #elif defined(USE_AURA) && defined(OS_LINUX) 1356 #elif defined(USE_AURA) && defined(OS_LINUX)
1357 // Always add the --views-desktop flag, if not already set. 1357 // Always add the --views-desktop flag, if not already set.
1358 if (!parsed_command_line().HasSwitch(switches::kViewsDesktop)) 1358 if (!parsed_command_line().HasSwitch(switches::kViewsDesktop))
1359 CommandLine::ForCurrentProcess()->AppendSwitch(switches::kViewsDesktop); 1359 CommandLine::ForCurrentProcess()->AppendSwitch(switches::kViewsDesktop);
1360 #endif 1360 #endif
1361 1361
1362 // Always add the --block-reading-third-party-cookies flag, if not already
1363 // set. We'll leave this on for a bit to determine if we Break The Web for
1364 // Canary users.
1365 //
1366 // TODO(mkwst): Remove this once impact is clear (http://crbug.com/98241).
1367 if (!parsed_command_line().HasSwitch(
1368 switches::kBlockReadingThirdPartyCookies))
1369 CommandLine::ForCurrentProcess()->AppendSwitch(
1370 switches::kBlockReadingThirdPartyCookies);
1371
1362 // Convert active labs into switches. Modifies the current command line. 1372 // Convert active labs into switches. Modifies the current command line.
1363 about_flags::ConvertFlagsToSwitches(local_state, 1373 about_flags::ConvertFlagsToSwitches(local_state,
1364 CommandLine::ForCurrentProcess()); 1374 CommandLine::ForCurrentProcess());
1365 1375
1366 // Reset the command line in the crash report details, since we may have 1376 // Reset the command line in the crash report details, since we may have
1367 // just changed it to include experiments. 1377 // just changed it to include experiments.
1368 child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); 1378 child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
1369 1379
1370 #if defined(TOOLKIT_VIEWS) 1380 #if defined(TOOLKIT_VIEWS)
1371 views::Widget::SetPureViews( 1381 views::Widget::SetPureViews(
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
2064 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2074 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2065 (pre_read == "0" || pre_read == "1")) { 2075 (pre_read == "0" || pre_read == "1")) {
2066 std::string uma_name(name); 2076 std::string uma_name(name);
2067 uma_name += "_PreRead"; 2077 uma_name += "_PreRead";
2068 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2078 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2069 AddPreReadHistogramTime(uma_name.c_str(), time); 2079 AddPreReadHistogramTime(uma_name.c_str(), time);
2070 } 2080 }
2071 #endif 2081 #endif
2072 #endif 2082 #endif
2073 } 2083 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698