Upstream changes for android signin promo

chrome/browser/signin/signin_promo.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_PROMO_H_
 #define CHROME_BROWSER_SIGNIN_SIGNIN_PROMO_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 25 matching lines @@
   SOURCE_APP_LAUNCHER,
   SOURCE_APPS_PAGE_LINK,
   SOURCE_BOOKMARK_BUBBLE,
   SOURCE_AVATAR_BUBBLE_SIGN_IN,
   SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT,
   SOURCE_DEVICES_PAGE,
   SOURCE_REAUTH,
   SOURCE_UNKNOWN, // This must be last.
 };
 
+// Enum values used for Android signin promo actions.
+enum AndroidSigninPromoAction {
+  // The promo was enabled.
+  HISTOGRAM_ANDROID_SIGNIN_PROMO_ENABLED = 0,
+
+  // The promo was shown.
+  HISTOGRAM_ANDROID_SIGNIN_PROMO_SHOWN,
+
+  // The promo was declined.
+  HISTOGRAM_ANDROID_SIGNIN_PROMO_DECLINED,
+
+  // The promo was accepted.
+  HISTOGRAM_ANDROID_SIGNIN_PROMO_ACCEPTED,
+
+  // The promo was accepted and user clicked the settings link.
+  HISTOGRAM_ANDROID_SIGNIN_PROMO_ACCEPTED_WITH_ADVANCED,
+
+  HISTOGRAM_ANDROID_SIGNIN_PROMO_MAX,
+};
+
 // Returns true if the sign in promo should be visible.
 // |profile| is the profile of the tab the promo would be shown on.
 bool ShouldShowPromo(Profile* profile);
 
 // Returns true if we should show the sign in promo at startup.
 bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile);
 
 // Called when the sign in promo has been shown so that we can keep track
 // of the number of times we've displayed it.
 void DidShowPromoAtStartup(Profile* profile);
@@ skipping 44 matching lines @@
 
 // Forces UseWebBasedSigninFlow() to return true when set; used in tests only.
 void ForceWebBasedSigninFlowForTesting(bool force);
 
 // Registers the preferences the Sign In Promo needs.
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
 }  // namespace signin
 
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_PROMO_H_