Use different Access Point on iOS for phone and tablet

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 62 matching lines @@
                          bool is_google_homepage,
                          bool is_google_in_startpages,
                          bool already_ran,
                          bool omnibox_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,
+                              RLZTracker::ChromeOmnibox(),
                               rlz_lib::INSTALL);
 #if !defined(OS_IOS)
   rlz_lib::RecordProductEvent(rlz_lib::CHROME,
-                              RLZTracker::CHROME_HOME_PAGE,
+                              RLZTracker::ChromeHomePage(),
                               rlz_lib::INSTALL);
   rlz_lib::RecordProductEvent(rlz_lib::CHROME,
-                              RLZTracker::CHROME_APP_LIST,
+                              RLZTracker::ChromeAppList(),
                               rlz_lib::INSTALL);
 #endif  // !defined(OS_IOS)
 
   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,
+    if (!rlz_lib::GetAccessPointRlz(RLZTracker::ChromeOmnibox(), 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,
+                                  RLZTracker::ChromeOmnibox(),
                                   rlz_lib::SET_TO_GOOGLE);
     }
 
 #if !defined(OS_IOS)
     char homepage_rlz[rlz_lib::kMaxRlzLength + 1];
-    if (!rlz_lib::GetAccessPointRlz(RLZTracker::CHROME_HOME_PAGE, homepage_rlz,
+    if (!rlz_lib::GetAccessPointRlz(RLZTracker::ChromeHomePage(), 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,
+                                  RLZTracker::ChromeHomePage(),
                                   rlz_lib::SET_TO_GOOGLE);
     }
 
     char app_list_rlz[rlz_lib::kMaxRlzLength + 1];
-    if (!rlz_lib::GetAccessPointRlz(RLZTracker::CHROME_APP_LIST, app_list_rlz,
+    if (!rlz_lib::GetAccessPointRlz(RLZTracker::ChromeAppList(), 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,
+                                  RLZTracker::ChromeAppList(),
                                   rlz_lib::SET_TO_GOOGLE);
     }
 #endif  // !defined(OS_IOS)
   }
 
   // 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,
+                                RLZTracker::ChromeOmnibox(),
                                 rlz_lib::FIRST_SEARCH);
   }
 
 #if !defined(OS_IOS)
   // 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,
+                                RLZTracker::ChromeHomePage(),
                                 rlz_lib::FIRST_SEARCH);
   }
 
   // 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,
+                                RLZTracker::ChromeAppList(),
                                 rlz_lib::FIRST_SEARCH);
   }
 #endif  // !defined(OS_IOS)
 }
 
 bool SendFinancialPing(const std::string& brand,
                        const base::string16& lang,
                        const base::string16& referral) {
-  rlz_lib::AccessPoint points[] = {RLZTracker::CHROME_OMNIBOX,
+  rlz_lib::AccessPoint points[] = {RLZTracker::ChromeOmnibox(),
 #if !defined(OS_IOS)
-                                   RLZTracker::CHROME_HOME_PAGE,
-                                   RLZTracker::CHROME_APP_LIST,
+                                   RLZTracker::ChromeHomePage(),
+                                   RLZTracker::ChromeAppList(),
 #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;
-#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),
@@ skipping 59 matching lines @@
   if (!InitRlzDelayed(first_run, send_ping_immediately, delay,
                       is_google_default_search, is_google_homepage,
                       is_google_in_startpages)) {
     return false;
   }
 
 #if !defined(OS_IOS)
   // Prime the RLZ cache for the home page access point so that its avaiable
   // for the startup page if needed (i.e., when the startup page is set to
   // the home page).
-  GetAccessPointRlz(CHROME_HOME_PAGE, NULL);
+  GetAccessPointRlz(ChromeHomePage(), NULL);
 #endif  // !defined(OS_IOS)
 
   return true;
 }
 
 bool RLZTracker::Init(bool first_run,
                       bool send_ping_immediately,
                       base::TimeDelta delay,
                       bool is_google_default_search,
                       bool is_google_homepage,
@@ skipping 96 matching lines @@
 
   if (!IsBrandOrganic(brand_) && SendFinancialPing(brand_, lang, referral)) {
     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::ChromeOmnibox(), NULL);
 #if !defined(OS_IOS)
-    GetAccessPointRlz(RLZTracker::CHROME_HOME_PAGE, NULL);
-    GetAccessPointRlz(RLZTracker::CHROME_APP_LIST, NULL);
+    GetAccessPointRlz(RLZTracker::ChromeHomePage(), NULL);
+    GetAccessPointRlz(RLZTracker::ChromeAppList(), NULL);
 #endif  // !defined(OS_IOS)
   }
 
   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,
                                    const base::string16& referral) {
   return ::SendFinancialPing(brand, lang, referral);
 }
 
 void RLZTracker::Observe(int type,
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_OMNIBOX_OPENED_URL:
       // In M-36, we made NOTIFICATION_OMNIBOX_OPENED_URL fire more often than
       // it did previously.  The RLZ folks want RLZ's "first search" detection
       // to remain as unaffected as possible by this change.  This test is
       // there to keep the old behavior.
       if (!content::Details<OmniboxLog>(details).ptr()->is_popup_open)
         break;
-      RecordFirstSearch(CHROME_OMNIBOX);
+      RecordFirstSearch(ChromeOmnibox());
       registrar_.Remove(this, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
                         content::NotificationService::AllSources());
       break;
 #if !defined(OS_IOS)
     case content::NOTIFICATION_NAV_ENTRY_PENDING: {
       const NavigationEntry* entry =
           content::Details<content::NavigationEntry>(details).ptr();
       if (entry != NULL &&
           ((entry->GetTransitionType() &
             content::PAGE_TRANSITION_HOME_PAGE) != 0)) {
-        RecordFirstSearch(CHROME_HOME_PAGE);
+        RecordFirstSearch(ChromeHomePage());
         registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
                           content::NotificationService::AllSources());
       }
       break;
     }
 #endif  // !defined(OS_IOS)
     default:
       NOTREACHED();
       break;
   }
@@ skipping 46 matching lines @@
   // In such case we repost the task on the right thread and return error.
   if (ScheduleRecordFirstSearch(point))
     return;
 
   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)
+  else if (send_ping_immediately_ && point == ChromeOmnibox())
     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)
+  if (point == ChromeOmnibox())
     return &omnibox_used_;
 #if !defined(OS_IOS)
-  if (point == CHROME_HOME_PAGE)
+  if (point == ChromeHomePage())
     return &homepage_used_;
-  if (point == CHROME_APP_LIST)
+  if (point == ChromeAppList())
     return &app_list_used_;
 #endif  // !defined(OS_IOS)
   NOTREACHED();
   return NULL;
 }
 
 // static
 std::string RLZTracker::GetAccessPointHttpHeader(rlz_lib::AccessPoint point) {
   TRACE_EVENT0("RLZ", "RLZTracker::GetAccessPointHttpHeader");
   std::string extra_headers;
@@ skipping 97 matching lines @@
 }
 
 // static
 void RLZTracker::EnableZeroDelayForTesting() {
   GetInstance()->min_init_delay_ = base::TimeDelta();
 }
 
 #if !defined(OS_IOS)
 // static
 void RLZTracker::RecordAppListSearch() {
-  GetInstance()->RecordFirstSearch(RLZTracker::CHROME_APP_LIST);
+  GetInstance()->RecordFirstSearch(RLZTracker::ChromeAppList());
 }
 #endif