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

Unified 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: Re-apply ps#16, it got lost 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 0fc08e52714519b58a083013b27be6c969c3569c..1d7c829bee7e1906f2d64424bd98905cabfbca16 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -70,6 +70,7 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/rlz/rlz.h"
#include "chrome/browser/signin/token_service_factory.h"
#include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
#include "chrome/common/chrome_notification_types.h"
@@ -496,6 +497,11 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
&tracker_);
#endif
+#if defined(ENABLE_RLZ)
+ if (parsed_command_line().HasSwitch(::switches::kTestType))
+ RLZTracker::EnableZeroDelayForTesting();
Peter Kasting 2012/12/17 20:14:03 Must we call this here? Can we instead enable in
Ivan Korotkov 2012/12/20 09:20:42 I'd like to leave it here (like WizardController::
Peter Kasting 2012/12/20 19:32:00 Then can we make one of the following happen inste
Ivan Korotkov 2012/12/21 09:59:48 Ok, let's do the 1st option.
+#endif
+
// In Aura builds this will initialize ash::Shell.
ChromeBrowserMainPartsLinux::PreProfileInit();
}
@@ -521,6 +527,9 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies);
if (use_shared_proxies_pref->IsDefaultValue())
profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
+
+ // This is done in LoginUtils::OnProfileCreated during normal login.
+ LoginUtils::Get()->InitRlzDelayed(profile());
}
// Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_utils.h » ('j') | chrome/browser/chromeos/login/login_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698