Commit bd4c75c6 authored by sdefresne's avatar sdefresne Committed by Commit bot

Remove iOS specific code from ChromeRLZTrackerDelegate.

iOS has its own implementation of RLZTrackerDelegate in //ios/chrome/rlz
so remove code protected by OS_IOS in chrome_rlz_tracker_delagate.{h,cc}.

Fix #include.

BUG=511570

Review URL: https://codereview.chromium.org/1243733002

Cr-Commit-Position: refs/heads/master@{#339850}
parent be57b32c
...@@ -5,12 +5,15 @@ ...@@ -5,12 +5,15 @@
#include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h" #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/logging.h"
#include "base/prefs/pref_service.h" #include "base/prefs/pref_service.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/google/google_brand.h" #include "chrome/browser/google/google_brand.h"
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "components/google/core/browser/google_util.h" #include "components/google/core/browser/google_util.h"
...@@ -29,11 +32,6 @@ ...@@ -29,11 +32,6 @@
#include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/google_update_settings.h"
#endif #endif
#if !defined(OS_IOS)
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#endif
ChromeRLZTrackerDelegate::ChromeRLZTrackerDelegate() { ChromeRLZTrackerDelegate::ChromeRLZTrackerDelegate() {
} }
...@@ -63,7 +61,6 @@ bool ChromeRLZTrackerDelegate::IsGoogleHomepage(Profile* profile) { ...@@ -63,7 +61,6 @@ bool ChromeRLZTrackerDelegate::IsGoogleHomepage(Profile* profile) {
// static // static
bool ChromeRLZTrackerDelegate::IsGoogleInStartpages(Profile* profile) { bool ChromeRLZTrackerDelegate::IsGoogleInStartpages(Profile* profile) {
#if !defined(OS_IOS)
bool is_google_in_startpages = false; bool is_google_in_startpages = false;
SessionStartupPref session_startup_prefs = SessionStartupPref session_startup_prefs =
StartupBrowserCreator::GetSessionStartupPref( StartupBrowserCreator::GetSessionStartupPref(
...@@ -75,10 +72,6 @@ bool ChromeRLZTrackerDelegate::IsGoogleInStartpages(Profile* profile) { ...@@ -75,10 +72,6 @@ bool ChromeRLZTrackerDelegate::IsGoogleInStartpages(Profile* profile) {
google_util::IsGoogleHomePageUrl) > 0; google_util::IsGoogleHomePageUrl) > 0;
} }
return is_google_in_startpages; return is_google_in_startpages;
#else
// iOS does not have a notion of startpages.
return false;
#endif
} }
void ChromeRLZTrackerDelegate::Cleanup() { void ChromeRLZTrackerDelegate::Cleanup() {
...@@ -156,12 +149,10 @@ void ChromeRLZTrackerDelegate::SetOmniboxSearchCallback( ...@@ -156,12 +149,10 @@ void ChromeRLZTrackerDelegate::SetOmniboxSearchCallback(
void ChromeRLZTrackerDelegate::SetHomepageSearchCallback( void ChromeRLZTrackerDelegate::SetHomepageSearchCallback(
const base::Closure& callback) { const base::Closure& callback) {
#if !defined(OS_IOS)
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources()); content::NotificationService::AllSources());
on_homepage_search_callback_ = callback; on_homepage_search_callback_ = callback;
#endif
} }
void ChromeRLZTrackerDelegate::Observe( void ChromeRLZTrackerDelegate::Observe(
...@@ -183,7 +174,6 @@ void ChromeRLZTrackerDelegate::Observe( ...@@ -183,7 +174,6 @@ void ChromeRLZTrackerDelegate::Observe(
swap(callback_to_run, on_omnibox_search_callback_); swap(callback_to_run, on_omnibox_search_callback_);
break; break;
#if !defined(OS_IOS)
case content::NOTIFICATION_NAV_ENTRY_COMMITTED: { case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
// Firstly check if it is a Google search. // Firstly check if it is a Google search.
content::LoadCommittedDetails* load_details = content::LoadCommittedDetails* load_details =
...@@ -224,7 +214,6 @@ void ChromeRLZTrackerDelegate::Observe( ...@@ -224,7 +214,6 @@ void ChromeRLZTrackerDelegate::Observe(
} }
break; break;
} }
#endif // !defined(OS_IOS)
default: default:
NOTREACHED(); NOTREACHED();
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_RLZ_CHROME_RLZ_TRACKER_DELEGATE_H_ #ifndef CHROME_BROWSER_RLZ_CHROME_RLZ_TRACKER_DELEGATE_H_
#define CHROME_BROWSER_RLZ_CHROME_RLZ_TRACKER_DELEGATE_H_ #define CHROME_BROWSER_RLZ_CHROME_RLZ_TRACKER_DELEGATE_H_
#include "base/callback_list.h" #include "base/callback.h"
#include "base/macros.h" #include "base/macros.h"
#include "components/rlz/rlz_tracker_delegate.h" #include "components/rlz/rlz_tracker_delegate.h"
#include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_observer.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment