Add RLZ Access points for the app launcher.

chrome/browser/rlz/rlz.cc

 // Copyright (c) 2012 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.
 //
 // This code glues the RLZ library DLL with Chrome. It allows Chrome to work
 // with or without the DLL being present. If the DLL is not present the
 // functions do nothing and just return false.
 
 #include "chrome/browser/rlz/rlz.h"
 
@@ skipping 55 matching lines @@
 bool IsBrandOrganic(const std::string& brand) {
   return brand.empty() || google_util::IsOrganic(brand);
 }
 
 void RecordProductEvents(bool first_run,
                          bool is_google_default_search,
                          bool is_google_homepage,
                          bool is_google_in_startpages,
                          bool already_ran,
                          bool omnibox_used,
-                         bool homepage_used) {
+                         bool homepage_used,
+                         bool app_list_used) {
   TRACE_EVENT0("RLZ", "RecordProductEvents");
   // Record the installation of chrome. We call this all the time but the rlz
   // lib should ignore all but the first one.
   rlz_lib::RecordProductEvent(rlz_lib::CHROME,
                               RLZTracker::CHROME_OMNIBOX,
                               rlz_lib::INSTALL);
   rlz_lib::RecordProductEvent(rlz_lib::CHROME,
                               RLZTracker::CHROME_HOME_PAGE,
                               rlz_lib::INSTALL);
+#if !defined(OS_IOS)
+  rlz_lib::RecordProductEvent(rlz_lib::CHROME,
+                              RLZTracker::CHROME_APP_LIST,
+                              rlz_lib::INSTALL);
+#endif
 
   if (!already_ran) {
     // Do the initial event recording if is the first run or if we have an
     // empty rlz which means we haven't got a chance to do it.
     char omnibox_rlz[rlz_lib::kMaxRlzLength + 1];
     if (!rlz_lib::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, omnibox_rlz,
                                     rlz_lib::kMaxRlzLength)) {
       omnibox_rlz[0] = 0;
     }
 
     // Record if google is the initial search provider and/or home page.
     if ((first_run || omnibox_rlz[0] == 0) && is_google_default_search) {
       rlz_lib::RecordProductEvent(rlz_lib::CHROME,
                                   RLZTracker::CHROME_OMNIBOX,
                                   rlz_lib::SET_TO_GOOGLE);
     }
 
     char homepage_rlz[rlz_lib::kMaxRlzLength + 1];
     if (!rlz_lib::GetAccessPointRlz(RLZTracker::CHROME_HOME_PAGE, homepage_rlz,
                                     rlz_lib::kMaxRlzLength)) {
       homepage_rlz[0] = 0;
     }
 
     if ((first_run || homepage_rlz[0] == 0) &&
         (is_google_homepage || is_google_in_startpages)) {
       rlz_lib::RecordProductEvent(rlz_lib::CHROME,
                                   RLZTracker::CHROME_HOME_PAGE,
                                   rlz_lib::SET_TO_GOOGLE);
     }
+
+#if !defined(OS_IOS)
+    char app_list_rlz[rlz_lib::kMaxRlzLength + 1];
+    if (!rlz_lib::GetAccessPointRlz(RLZTracker::CHROME_APP_LIST, app_list_rlz,
+                                    rlz_lib::kMaxRlzLength)) {
+      app_list_rlz[0] = 0;
+    }
+
+    // Record if google is the initial search provider and/or home page.
+    if ((first_run || app_list_rlz[0] == 0) && is_google_default_search) {
+      rlz_lib::RecordProductEvent(rlz_lib::CHROME,
+                                  RLZTracker::CHROME_APP_LIST,
+                                  rlz_lib::SET_TO_GOOGLE);
+    }
+#endif
   }
 
   // Record first user interaction with the omnibox. We call this all the
   // time but the rlz lib should ingore all but the first one.
   if (omnibox_used) {
     rlz_lib::RecordProductEvent(rlz_lib::CHROME,
                                 RLZTracker::CHROME_OMNIBOX,
                                 rlz_lib::FIRST_SEARCH);
   }
 
   // Record first user interaction with the home page. We call this all the
   // time but the rlz lib should ingore all but the first one.
   if (homepage_used || is_google_in_startpages) {
     rlz_lib::RecordProductEvent(rlz_lib::CHROME,
                                 RLZTracker::CHROME_HOME_PAGE,
                                 rlz_lib::FIRST_SEARCH);
   }
+
+#if !defined(OS_IOS)
+  // Record first user interaction with the app list. We call this all the
+  // time but the rlz lib should ingore all but the first one.
+  if (app_list_used) {
+    rlz_lib::RecordProductEvent(rlz_lib::CHROME,
+                                RLZTracker::CHROME_APP_LIST,
+                                rlz_lib::FIRST_SEARCH);
+  }
+#endif
 }
 
 bool SendFinancialPing(const std::string& brand,
                        const base::string16& lang,
                        const base::string16& referral) {
   rlz_lib::AccessPoint points[] = {RLZTracker::CHROME_OMNIBOX,
                                    RLZTracker::CHROME_HOME_PAGE,
+#if !defined(OS_IOS)
+                                   RLZTracker::CHROME_APP_LIST,
+#endif
                                    rlz_lib::NO_ACCESS_POINT};
   std::string lang_ascii(base::UTF16ToASCII(lang));
   std::string referral_ascii(base::UTF16ToASCII(referral));
   std::string product_signature;
 #if defined(OS_CHROMEOS)
   product_signature = "chromeos";
 #else
   product_signature = "chrome";
 #endif
   return rlz_lib::SendFinancialPing(rlz_lib::CHROME, points,
                                     product_signature.c_str(),
                                     brand.c_str(), referral_ascii.c_str(),
                                     lang_ascii.c_str(), false, true);
 }
 
 }  // namespace
 
 #if defined(OS_WIN)
 // static
 const rlz_lib::AccessPoint RLZTracker::CHROME_OMNIBOX =
     rlz_lib::CHROME_OMNIBOX;
 // static
 const rlz_lib::AccessPoint RLZTracker::CHROME_HOME_PAGE =
     rlz_lib::CHROME_HOME_PAGE;
+// static
+const rlz_lib::AccessPoint RLZTracker::CHROME_APP_LIST =
+    rlz_lib::CHROME_APP_LIST;
 #elif defined(OS_IOS)
 // static
 const rlz_lib::AccessPoint RLZTracker::CHROME_OMNIBOX =
     rlz_lib::CHROME_IOS_OMNIBOX;
 // static
 const rlz_lib::AccessPoint RLZTracker::CHROME_HOME_PAGE =
     rlz_lib::CHROME_IOS_HOME_PAGE;
 #elif defined(OS_MACOSX)
 // static
 const rlz_lib::AccessPoint RLZTracker::CHROME_OMNIBOX =
     rlz_lib::CHROME_MAC_OMNIBOX;
 // static
 const rlz_lib::AccessPoint RLZTracker::CHROME_HOME_PAGE =
     rlz_lib::CHROME_MAC_HOME_PAGE;
+// static
+const rlz_lib::AccessPoint RLZTracker::CHROME_APP_LIST =
+    rlz_lib::CHROME_MAC_APP_LIST;
 #elif defined(OS_CHROMEOS)
 // static
 const rlz_lib::AccessPoint RLZTracker::CHROME_OMNIBOX =
     rlz_lib::CHROMEOS_OMNIBOX;
 // static
 const rlz_lib::AccessPoint RLZTracker::CHROME_HOME_PAGE =
     rlz_lib::CHROMEOS_HOME_PAGE;
+// static
+const rlz_lib::AccessPoint RLZTracker::CHROME_APP_LIST =
+    rlz_lib::CHROMEOS_APP_LIST;
 #endif
 
 RLZTracker* RLZTracker::tracker_ = NULL;
 
 // static
 RLZTracker* RLZTracker::GetInstance() {
   return tracker_ ? tracker_ : Singleton<RLZTracker>::get();
 }
 
 RLZTracker::RLZTracker()
     : first_run_(false),
       send_ping_immediately_(false),
       is_google_default_search_(false),
       is_google_homepage_(false),
       is_google_in_startpages_(false),
       worker_pool_token_(BrowserThread::GetBlockingPool()->GetSequenceToken()),
       already_ran_(false),
       omnibox_used_(false),
       homepage_used_(false),
+      app_list_used_(false),
       min_init_delay_(kMinInitDelay) {
 }
 
 RLZTracker::~RLZTracker() {
 }
 
 // static
 bool RLZTracker::InitRlzDelayed(bool first_run,
                                 bool send_ping_immediately,
                                 base::TimeDelta delay,
@@ skipping 106 matching lines @@
 }
 
 void RLZTracker::DelayedInit() {
   bool schedule_ping = false;
 
   // For organic brandcodes do not use rlz at all. Empty brandcode usually
   // means a chromium install. This is ok.
   if (!IsBrandOrganic(brand_)) {
     RecordProductEvents(first_run_, is_google_default_search_,
                         is_google_homepage_, is_google_in_startpages_,
-                        already_ran_, omnibox_used_, homepage_used_);
+                        already_ran_, omnibox_used_, homepage_used_,
+                        app_list_used_);
     schedule_ping = true;
   }
 
   // If chrome has been reactivated, record the events for this brand
   // as well.
   if (!IsBrandOrganic(reactivation_brand_)) {
     rlz_lib::SupplementaryBranding branding(reactivation_brand_.c_str());
     RecordProductEvents(first_run_, is_google_default_search_,
                         is_google_homepage_, is_google_in_startpages_,
-                        already_ran_, omnibox_used_, homepage_used_);
+                        already_ran_, omnibox_used_, homepage_used_,
+                        app_list_used_);
     schedule_ping = true;
   }
 
   already_ran_ = true;
 
   if (schedule_ping)
     ScheduleFinancialPing();
 }
 
 void RLZTracker::ScheduleFinancialPing() {
@@ skipping 17 matching lines @@
     GoogleUpdateSettings::ClearReferral();
 
     {
       base::AutoLock lock(cache_lock_);
       rlz_cache_.clear();
     }
 
     // Prime the RLZ cache for the access points we are interested in.
     GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, NULL);
     GetAccessPointRlz(RLZTracker::CHROME_HOME_PAGE, NULL);
+#if !defined(OS_IOS)
+    GetAccessPointRlz(RLZTracker::CHROME_APP_LIST, NULL);
+#endif
   }
 
   if (!IsBrandOrganic(reactivation_brand_)) {
     rlz_lib::SupplementaryBranding branding(reactivation_brand_.c_str());
     SendFinancialPing(reactivation_brand_, lang, referral);
   }
 }
 
 bool RLZTracker::SendFinancialPing(const std::string& brand,
                                    const base::string16& lang,
@@ skipping 69 matching lines @@
 
   return true;
 }
 
 void RLZTracker::RecordFirstSearch(rlz_lib::AccessPoint point) {
   // Make sure we don't access disk outside of the I/O thread.
   // In such case we repost the task on the right thread and return error.
   if (ScheduleRecordFirstSearch(point))
     return;
 
-  bool* record_used = point == CHROME_OMNIBOX ?
-      &omnibox_used_ : &homepage_used_;
+  bool* record_used = GetAccessPointRecord(point);
 
   // Try to record event now, else set the flag to try later when we
   // attempt the ping.
   if (!RecordProductEvent(rlz_lib::CHROME, point, rlz_lib::FIRST_SEARCH))
     *record_used = true;
   else if (send_ping_immediately_ && point == CHROME_OMNIBOX)
     ScheduleDelayedInit(base::TimeDelta());
 }
 
 bool RLZTracker::ScheduleRecordFirstSearch(rlz_lib::AccessPoint point) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI))
     return false;
   BrowserThread::GetBlockingPool()->PostSequencedWorkerTaskWithShutdownBehavior(
       worker_pool_token_,
       FROM_HERE,
       base::Bind(&RLZTracker::RecordFirstSearch,
                  base::Unretained(this), point),
       base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
   return true;
 }
 
+bool* RLZTracker::GetAccessPointRecord(rlz_lib::AccessPoint point) {
+  if (point == CHROME_OMNIBOX)
+    return &omnibox_used_;
+  if (point == CHROME_HOME_PAGE)
+    return &homepage_used_;
+#if !defined(OS_IOS)
+  if (point == CHROME_APP_LIST)
+    return &app_list_used_;
+#endif
+  NOTREACHED();
+  return NULL;
+}
+
 // static
 std::string RLZTracker::GetAccessPointHttpHeader(rlz_lib::AccessPoint point) {
   TRACE_EVENT0("RLZ", "RLZTracker::GetAccessPointHttpHeader");
   std::string extra_headers;
   base::string16 rlz_string;
   RLZTracker::GetAccessPointRlz(point, &rlz_string);
   if (!rlz_string.empty()) {
     net::HttpUtil::AppendHeaderIfMissing("X-Rlz-String",
                                          base::UTF16ToUTF8(rlz_string),
                                          &extra_headers);
@@ skipping 87 matching lines @@
 void RLZTracker::CleanupRlz() {
   GetInstance()->rlz_cache_.clear();
   GetInstance()->registrar_.RemoveAll();
   rlz_lib::SetURLRequestContext(NULL);
 }
 
 // static
 void RLZTracker::EnableZeroDelayForTesting() {
   GetInstance()->min_init_delay_ = base::TimeDelta();
 }
+
+#if !defined(OS_IOS)
+// static
+void RLZTracker::RecordAppListSearch() {
+  GetInstance()->RecordFirstSearch(RLZTracker::CHROME_APP_LIST);
+}
+#endif