Adds full-functional search results for Athena on Chrome.

athena/main/athena_launcher.cc

 // Copyright 2014 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 "athena/main/public/athena_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/content/public/content_activity_factory_creator.h"
 #include "athena/env/public/athena_env.h"
+#include "athena/extensions/public/apps_search_controller_factory.h"
 #include "athena/extensions/public/extension_app_model_builder.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/home/public/home_card.h"
+#include "athena/home/public/search_controller_factory.h"
 #include "athena/input/public/input_manager.h"
 #include "athena/main/athena_views_delegate.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/placeholder.h"
-#include "athena/main/url_search_provider.h"
 #include "athena/resource_manager/public/resource_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/system/public/system_ui.h"
 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
 #include "athena/wm/public/window_manager.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/common/content_switches.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/aura/window_property.h"
@@ skipping 91 matching lines @@
   athena::ScreenManager::Get()->GetContext()->SetProperty(
       kAthenaEnvStateKey, env_state);
 }
 
 void CreateVirtualKeyboardWithContext(content::BrowserContext* context) {
   athena::VirtualKeyboardManager::Create(context);
 }
 
 void StartAthenaSessionWithContext(content::BrowserContext* context) {
   athena::ExtensionsDelegate::CreateExtensionsDelegate(context);
-  StartAthenaSession(athena::CreateContentActivityFactory(),
-                     new athena::ExtensionAppModelBuilder(context));
-  athena::HomeCard::Get()->RegisterSearchProvider(
-      new athena::UrlSearchProvider(context));
+  StartAthenaSession(
+      athena::CreateContentActivityFactory(),
+      make_scoped_ptr(new athena::ExtensionAppModelBuilder(context)),
+      athena::CreateSearchControllerFactory(context));
   AthenaEnvState* env_state =
       athena::ScreenManager::Get()->GetContext()->GetProperty(
           kAthenaEnvStateKey);
 
   env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver);
   CreateTestPages(context);
 }
 
-void StartAthenaSession(athena::ActivityFactory* activity_factory,
-                        athena::AppModelBuilder* app_model_builder) {
+void StartAthenaSession(
+    athena::ActivityFactory* activity_factory,
+    scoped_ptr<athena::AppModelBuilder> app_model_builder,
+    scoped_ptr<athena::SearchControllerFactory> search_factory) {
   DCHECK(!session_started);
   session_started = true;
-  athena::HomeCard::Create(app_model_builder);
+  athena::HomeCard::Create(app_model_builder.Pass(), search_factory.Pass());
   athena::ActivityManager::Create();
   athena::ResourceManager::Create();
   athena::ActivityFactory::RegisterActivityFactory(activity_factory);
 }
 
 void ShutdownAthena() {
   if (session_started) {
     athena::ActivityFactory::Shutdown();
     athena::ResourceManager::Shutdown();
     athena::ActivityManager::Shutdown();
     athena::HomeCard::Shutdown();
     athena::ExtensionsDelegate::Shutdown();
     session_started = false;
   }
   athena::AppRegistry::ShutDown();
   athena::WindowManager::Shutdown();
   athena::SystemUI::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::AthenaEnv::Shutdown();
 
   ShutdownAthenaViewsDelegate();
 }
 
 }  // namespace athena