Remove old (dead) app list code.

chrome/browser/ui/app_list/start_page_service.cc

 // 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.
 
 #include "chrome/browser/ui/app_list/start_page_service.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 310 matching lines @@
       state_(app_list::SPEECH_RECOGNITION_READY),
       speech_button_toggled_manually_(false),
       speech_result_obtained_(false),
       webui_finished_loading_(false),
       speech_auth_helper_(new SpeechAuthHelper(profile, &clock_)),
       network_available_(true),
       microphone_available_(true),
       search_engine_is_google_(false),
       backoff_entry_(&kDoodleBackoffPolicy),
       weak_factory_(this) {
-  if (switches::IsExperimentalAppListEnabled()) {
-    TemplateURLService* template_url_service =
-        TemplateURLServiceFactory::GetForProfile(profile_);
-    const TemplateURL* default_provider =
-        template_url_service->GetDefaultSearchProvider();
-    search_engine_is_google_ =
-        default_provider->GetEngineType(
-            template_url_service->search_terms_data()) ==
-        SEARCH_ENGINE_GOOGLE;
-  }
+  TemplateURLService* template_url_service =
+      TemplateURLServiceFactory::GetForProfile(profile_);
+  const TemplateURL* default_provider =
+      template_url_service->GetDefaultSearchProvider();
+  search_engine_is_google_ =
+      default_provider->GetEngineType(
+          template_url_service->search_terms_data()) == SEARCH_ENGINE_GOOGLE;
 
   network_change_observer_.reset(new NetworkChangeObserver(this));
 }
 
 StartPageService::~StartPageService() {
 }
 
 void StartPageService::AddObserver(StartPageObserver* observer) {
   observers_.AddObserver(observer);
 }
@@ skipping 19 matching lines @@
       OnSpeechRecognitionStateChanged(SPEECH_RECOGNITION_READY);
   } else {
     OnSpeechRecognitionStateChanged(network_available_ ? SPEECH_RECOGNITION_OFF
                                         : SPEECH_RECOGNITION_NETWORK_ERROR);
   }
 }
 
 void StartPageService::Init() {
   // Do not load the start page web contents in tests because many tests assume
   // no WebContents exist except the ones they make.
-  if (switches::IsExperimentalAppListEnabled() &&
-      !base::CommandLine::ForCurrentProcess()->HasSwitch(
-          ::switches::kTestType)) {
-    content::BrowserThread::PostDelayedTask(
-        content::BrowserThread::UI, FROM_HERE,
-        base::Bind(&StartPageService::LoadContentsIfNeeded,
-                   weak_factory_.GetWeakPtr()),
-        base::TimeDelta::FromSeconds(kLoadContentsDelaySeconds));
-  }
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType))
+    return;
+
+  content::BrowserThread::PostDelayedTask(
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(&StartPageService::LoadContentsIfNeeded,
+                 weak_factory_.GetWeakPtr()),
+      base::TimeDelta::FromSeconds(kLoadContentsDelaySeconds));
 }
 
 void StartPageService::LoadContentsIfNeeded() {
   if (!contents_)
     LoadContents();
 }
 
 bool StartPageService::ShouldEnableSpeechRecognition() const {
   return microphone_available_ && network_available_;
 }
 
 void StartPageService::AppListShown() {
   if (!contents_) {
     LoadContents();
   } else if (contents_->IsCrashed()) {
     LoadStartPageURL();
   } else if (contents_->GetWebUI()) {
     contents_->GetWebUI()->CallJavascriptFunctionUnsafe(
         "appList.startPage.onAppListShown");
   }
 
 #if defined(OS_CHROMEOS)
   audio_status_.reset(new AudioStatus(this));
 #endif
 }
 
 void StartPageService::AppListHidden() {
-  if (!app_list::switches::IsExperimentalAppListEnabled())
-    UnloadContents();
-
   if (speech_recognizer_) {
     StopSpeechRecognition();
   }
 
 #if defined(OS_CHROMEOS)
   audio_status_.reset();
 #endif
 }
 
 void StartPageService::StartSpeechRecognition(
@@ skipping 38 matching lines @@
   return state_ != SPEECH_RECOGNITION_OFF &&
       service &&
       (service->IsSometimesOnEnabled() || service->IsAlwaysOnEnabled()) &&
       service->IsServiceAvailable();
 #else
   return false;
 #endif
 }
 
 content::WebContents* StartPageService::GetStartPageContents() {
-  return app_list::switches::IsExperimentalAppListEnabled() ? contents_.get()
-                                                            : NULL;
+  return contents_.get();
 }
 
 content::WebContents* StartPageService::GetSpeechRecognitionContents() {
   if (app_list::switches::IsVoiceSearchEnabled()) {
     if (!contents_)
       LoadContents();
     return contents_.get();
   }
   return NULL;
 }
@@ skipping 205 matching lines @@
 
   // Check for a new doodle.
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&StartPageService::FetchDoodleJson,
                  weak_factory_.GetWeakPtr()),
       recheck_delay);
 }
 
 }  // namespace app_list