Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2379)

Unified Diff: athena/main/public/athena_launcher.h

Issue 640103002: Adds full-functional search results for Athena on Chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix DEPS Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/main/athena_main.gyp ('k') | athena/main/url_search_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/public/athena_launcher.h
diff --git a/athena/main/public/athena_launcher.h b/athena/main/public/athena_launcher.h
index 550dce360cac9c464d32ce7e62c6b41e7f6daaa2..732129c2a8d5354e407cdf0748e56678affe9ba7 100644
--- a/athena/main/public/athena_launcher.h
+++ b/athena/main/public/athena_launcher.h
@@ -6,6 +6,7 @@
#define ATHENA_MAIN_PUBLIC_ATHENA_LAUNCHER_H_
#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
namespace base {
class TaskRunner;
@@ -22,6 +23,7 @@ class BrowserContext;
namespace athena {
class ActivityFactory;
class AppModelBuilder;
+class SearchControllerFactory;
// Starts down the athena shell environment.
void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner);
@@ -32,7 +34,8 @@ void CreateVirtualKeyboardWithContext(content::BrowserContext* context);
// Starts the athena session.
void StartAthenaSession(ActivityFactory* activity_factory,
- AppModelBuilder* app_model_builder);
+ scoped_ptr<AppModelBuilder> app_model_builder,
+ scoped_ptr<SearchControllerFactory> search_factory);
void ShutdownAthena();
« no previous file with comments | « athena/main/athena_main.gyp ('k') | athena/main/url_search_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698