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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 11506006: [cros] RLZ tracking can be turned off via a flag file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 8 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 // TODO(mnissler): Remove once OAuth is the only authentication mechanism. 513 // TODO(mnissler): Remove once OAuth is the only authentication mechanism.
514 connector->SetUserPolicyTokenService( 514 connector->SetUserPolicyTokenService(
515 TokenServiceFactory::GetForProfile(profile())); 515 TokenServiceFactory::GetForProfile(profile()));
516 516
517 // Make sure we flip every profile to not share proxies if the user hasn't 517 // Make sure we flip every profile to not share proxies if the user hasn't
518 // specified so explicitly. 518 // specified so explicitly.
519 const PrefService::Preference* use_shared_proxies_pref = 519 const PrefService::Preference* use_shared_proxies_pref =
520 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies); 520 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies);
521 if (use_shared_proxies_pref->IsDefaultValue()) 521 if (use_shared_proxies_pref->IsDefaultValue())
522 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false); 522 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
523
524 // Initialize RLZ tracking.
Nikita (slow) 2012/12/11 13:02:54 nit: Remove this comment.
Ivan Korotkov 2012/12/11 15:44:53 Done.
525 LoginUtils::Get()->InitRlzDelayed();
Nikita (slow) 2012/12/11 13:02:54 Pass profile() here.
Ivan Korotkov 2012/12/11 15:44:53 Done.
523 } 526 }
524 527
525 // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC 528 // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC
526 // configuration before login. 529 // configuration before login.
527 connector->GetNetworkConfigurationUpdater(); 530 connector->GetNetworkConfigurationUpdater();
528 531
529 // Make sure that wallpaper boot transition and other delays in OOBE 532 // Make sure that wallpaper boot transition and other delays in OOBE
530 // are disabled for tests by default. 533 // are disabled for tests by default.
531 // Individual tests may enable them if they want. 534 // Individual tests may enable them if they want.
532 if (parsed_command_line().HasSwitch(::switches::kTestType)) 535 if (parsed_command_line().HasSwitch(::switches::kTestType))
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 } else if (trial->group() == margin_200mb) { 731 } else if (trial->group() == margin_200mb) {
729 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 732 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
730 LowMemoryObserver::SetLowMemoryMargin(200); 733 LowMemoryObserver::SetLowMemoryMargin(200);
731 } else { 734 } else {
732 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 735 LOG(WARNING) << "low_mem: Part of 'default' experiment";
733 } 736 }
734 } 737 }
735 } 738 }
736 739
737 } // namespace chromeos 740 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698