summaryrefslogtreecommitdiffstats
path: root/ios/chrome/browser/rlz
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2015-07-21 10:30:53 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-21 17:32:51 +0000
commit2979b61e15bf40459245992a817bf5f5f3c3e332 (patch)
tree22121ff62020955e8f11a7567978185958472c48 /ios/chrome/browser/rlz
parent455f7e6bde0882fcc8fcfeac1abaeb35e28709e3 (diff)
downloadchromium_src-2979b61e15bf40459245992a817bf5f5f3c3e332.zip
chromium_src-2979b61e15bf40459245992a817bf5f5f3c3e332.tar.gz
chromium_src-2979b61e15bf40459245992a817bf5f5f3c3e332.tar.bz2
Revert of Implements RLZTrackerDelegate on iOS. (patchset #2 id:40001 of https://codereview.chromium.org/1242373002/)
Reason for revert: Landed wrong patchset. Original issue's description: > Implements RLZTrackerDelegate on iOS. > > BUG=511570 > > Committed: https://crrev.com/8ff2e5ea76f4aed908188f0368ccb12d290236a7 > Cr-Commit-Position: refs/heads/master@{#339676} TBR=droger@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=511570 Review URL: https://codereview.chromium.org/1250693003 Cr-Commit-Position: refs/heads/master@{#339685}
Diffstat (limited to 'ios/chrome/browser/rlz')
-rw-r--r--ios/chrome/browser/rlz/rlz_tracker_delegate_impl.cc137
-rw-r--r--ios/chrome/browser/rlz/rlz_tracker_delegate_impl.h57
2 files changed, 0 insertions, 194 deletions
diff --git a/ios/chrome/browser/rlz/rlz_tracker_delegate_impl.cc b/ios/chrome/browser/rlz/rlz_tracker_delegate_impl.cc
deleted file mode 100644
index 1261189..0000000
--- a/ios/chrome/browser/rlz/rlz_tracker_delegate_impl.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2015 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.
-
-#include "ios/chrome/browser/rlz/rlz_tracker_delegate_impl.h"
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/prefs/pref_service.h"
-#include "components/google/core/browser/google_util.h"
-#include "components/omnibox/browser/omnibox_log.h"
-#include "components/search_engines/template_url.h"
-#include "components/search_engines/template_url_service.h"
-#include "ios/chrome/browser/application_context.h"
-#include "ios/chrome/browser/google/google_brand.h"
-#include "ios/chrome/browser/omnibox/omnibox_edit_model_observer_relay.h"
-#include "ios/chrome/browser/pref_names.h"
-#include "ios/chrome/browser/search_engines/template_url_service_factory.h"
-#include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/web/public/web_thread.h"
-
-RLZTrackerDelegateImpl::RLZTrackerDelegateImpl() {}
-
-RLZTrackerDelegateImpl::~RLZTrackerDelegateImpl() {}
-
-// static
-bool RLZTrackerDelegateImpl::IsGoogleDefaultSearch(
- ios::ChromeBrowserState* browser_state) {
- bool is_google_default_search = false;
- TemplateURLService* template_url_service =
- ios::TemplateURLServiceFactory::GetForBrowserState(browser_state);
- if (template_url_service) {
- const TemplateURL* url_template =
- template_url_service->GetDefaultSearchProvider();
- is_google_default_search = url_template &&
- url_template->url_ref().HasGoogleBaseURLs(
- template_url_service->search_terms_data());
- }
- return is_google_default_search;
-}
-
-// static
-bool RLZTrackerDelegateImpl::IsGoogleHomepage(
- ios::ChromeBrowserState* browser_state) {
- return google_util::IsGoogleHomePageUrl(
- GURL(browser_state->GetPrefs()->GetString(ios::prefs::kHomePage)));
-}
-
-// static
-bool RLZTrackerDelegateImpl::IsGoogleInStartpages(
- ios::ChromeBrowserState* browser_state) {
- // iOS does not have a notion of startpages.
- return false;
-}
-
-void RLZTrackerDelegateImpl::Cleanup() {
- on_omnibox_search_callback_.Reset();
-}
-
-bool RLZTrackerDelegateImpl::IsOnUIThread() {
- return web::WebThread::CurrentlyOn(web::WebThread::UI);
-}
-
-base::SequencedWorkerPool* RLZTrackerDelegateImpl::GetBlockingPool() {
- return web::WebThread::GetBlockingPool();
-}
-
-net::URLRequestContextGetter* RLZTrackerDelegateImpl::GetRequestContext() {
- return GetApplicationContext()->GetSystemURLRequestContext();
-}
-
-bool RLZTrackerDelegateImpl::GetBrand(std::string* brand) {
- return ios::google_brand::GetBrand(brand);
-}
-
-bool RLZTrackerDelegateImpl::IsBrandOrganic(const std::string& brand) {
- return brand.empty() || ios::google_brand::IsOrganic(brand);
-}
-
-bool RLZTrackerDelegateImpl::GetReactivationBrand(std::string* brand) {
- // iOS does not have reactivation brand.
- return false;
-}
-
-bool RLZTrackerDelegateImpl::ShouldEnableZeroDelayForTesting() {
- return false;
-}
-
-bool RLZTrackerDelegateImpl::GetLanguage(base::string16* language) {
- // TODO(thakis): Implement.
- NOTIMPLEMENTED();
- return false;
-}
-
-bool RLZTrackerDelegateImpl::GetReferral(base::string16* referral) {
- // The referral program is defunct and not used. No need to implement this
- // function on non-Win platforms.
- return true;
-}
-
-bool RLZTrackerDelegateImpl::ClearReferral() {
- // The referral program is defunct and not used. No need to implement this
- // function on non-Win platforms.
- return true;
-}
-
-void RLZTrackerDelegateImpl::SetOmniboxSearchCallback(
- const base::Closure& callback) {
- DCHECK(!callback.is_null());
- on_omnibox_search_callback_ = callback;
- on_omnibox_url_opened_subscription_ =
- OmniboxEditModelObserverRelay::GetInstance()->RegisterCallback(
- base::Bind(&RLZTrackerDelegateImpl::OnURLOpenedFromOmnibox,
- base::Unretained(this)));
-}
-
-void RLZTrackerDelegateImpl::SetHomepageSearchCallback(
- const base::Closure& callback) {
- NOTREACHED();
-}
-
-void RLZTrackerDelegateImpl::OnURLOpenedFromOmnibox(OmniboxLog* log) {
- // 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 (!log->is_popup_open)
- return;
-
- on_omnibox_url_opened_subscription_.reset();
-
- using std::swap;
- base::Closure callback_to_run;
- swap(callback_to_run, on_omnibox_search_callback_);
- if (!callback_to_run.is_null())
- callback_to_run.Run();
-}
diff --git a/ios/chrome/browser/rlz/rlz_tracker_delegate_impl.h b/ios/chrome/browser/rlz/rlz_tracker_delegate_impl.h
deleted file mode 100644
index 8be2a2b..0000000
--- a/ios/chrome/browser/rlz/rlz_tracker_delegate_impl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 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 IOS_CHROME_BROWSER_RLZ_RLZ_TRACKER_DELEGATE_IMPL_H_
-#define IOS_CHROME_BROWSER_RLZ_RLZ_TRACKER_DELEGATE_IMPL_H_
-
-#include "base/callback.h"
-#include "base/callback_list.h"
-#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "components/rlz/rlz_tracker_delegate.h"
-
-struct OmniboxLog;
-
-namespace ios {
-class ChromeBrowserState;
-}
-
-// RLZTrackerDelegateImpl implements RLZTrackerDelegate abstract interface
-// and provides access to Chrome on iOS features.
-class RLZTrackerDelegateImpl : public rlz::RLZTrackerDelegate {
- public:
- RLZTrackerDelegateImpl();
- ~RLZTrackerDelegateImpl() override;
-
- static bool IsGoogleDefaultSearch(ios::ChromeBrowserState* browser_state);
- static bool IsGoogleHomepage(ios::ChromeBrowserState* browser_state);
- static bool IsGoogleInStartpages(ios::ChromeBrowserState* browser_state);
-
- private:
- // RLZTrackerDelegate implementation.
- void Cleanup() override;
- bool IsOnUIThread() override;
- base::SequencedWorkerPool* GetBlockingPool() override;
- net::URLRequestContextGetter* GetRequestContext() override;
- bool GetBrand(std::string* brand) override;
- bool IsBrandOrganic(const std::string& brand) override;
- bool GetReactivationBrand(std::string* brand) override;
- bool ShouldEnableZeroDelayForTesting() override;
- bool GetLanguage(base::string16* language) override;
- bool GetReferral(base::string16* referral) override;
- bool ClearReferral() override;
- void SetOmniboxSearchCallback(const base::Closure& callback) override;
- void SetHomepageSearchCallback(const base::Closure& callback) override;
-
- // Called when user open an URL from the Omnibox.
- void OnURLOpenedFromOmnibox(OmniboxLog* log);
-
- base::Closure on_omnibox_search_callback_;
- scoped_ptr<base::CallbackList<void(OmniboxLog*)>::Subscription>
- on_omnibox_url_opened_subscription_;
-
- DISALLOW_COPY_AND_ASSIGN(RLZTrackerDelegateImpl);
-};
-
-#endif // IOS_CHROME_BROWSER_RLZ_RLZ_TRACKER_DELEGATE_IMPL_H_