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

Unified Diff: athena/athena.gyp

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 | « no previous file | athena/content/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index 8453bcbb381ebeb02ff299d29ed2313a718ca4a6..e3bddc3eccffeb97c02003b22bf13590140fde33 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -65,6 +65,7 @@
'home/minimized_home.h',
'home/public/app_model_builder.h',
'home/public/home_card.h',
+ 'home/public/search_controller_factory.h',
'input/accelerator_manager_impl.cc',
'input/accelerator_manager_impl.h',
'input/input_manager_impl.cc',
@@ -158,7 +159,6 @@
'content/public/app_registry.h',
'content/public/content_activity_factory_creator.h',
'content/public/dialogs.h',
- 'content/public/scheme_classifier_factory.h',
'content/public/web_contents_view_delegate_creator.h',
'content/render_view_context_menu_impl.cc',
'content/render_view_context_menu_impl.h',
@@ -174,6 +174,7 @@
'extensions/athena_native_app_window_views.h',
'extensions/extension_app_model_builder.cc',
'extensions/extensions_delegate.cc',
+ 'extensions/pubilc/apps_search_controller_factory.h',
'extensions/public/extension_app_model_builder.h',
'extensions/public/extensions_delegate.h',
'virtual_keyboard/public/virtual_keyboard_manager.h',
@@ -191,12 +192,15 @@
'sources': [
'content/chrome/dialogs.cc',
'content/chrome/media_utils.cc',
- 'content/chrome/scheme_classifier_factory.cc',
'content/chrome/web_activity_helpers.cc',
+ 'extensions/chrome/app_list_controller_delegate_athena.cc',
+ 'extensions/chrome/app_list_controller_delegate_athena.h',
'extensions/chrome/athena_chrome_app_delegate.cc',
'extensions/chrome/athena_chrome_app_delegate.h',
'extensions/chrome/athena_chrome_app_window_client.cc',
'extensions/chrome/athena_chrome_app_window_client.h',
+ 'extensions/chrome/chrome_search_controller_factory.cc',
+ 'extensions/chrome/chrome_search_controller_factory.h',
'extensions/chrome/extensions_delegate_impl.cc',
],
},
@@ -212,14 +216,19 @@
'sources': [
'content/shell/dialogs.cc',
'content/shell/media_utils.cc',
- 'content/shell/scheme_classifier_factory.cc',
'content/shell/web_activity_helpers.cc',
'extensions/shell/extensions_delegate_impl.cc',
'extensions/shell/athena_shell_app_delegate.cc',
'extensions/shell/athena_shell_app_delegate.h',
'extensions/shell/athena_shell_app_window_client.cc',
'extensions/shell/athena_shell_app_window_client.h',
+ 'extensions/shell/athena_shell_scheme_classifier.cc',
+ 'extensions/shell/athena_shell_scheme_classifier.h',
'extensions/shell/athena_apps_client_delegate.h',
+ 'extensions/shell/shell_search_controller_factory.cc',
+ 'extensions/shell/shell_search_controller_factory.h',
+ 'extensions/shell/url_search_provider.cc',
+ 'extensions/shell/url_search_provider.h',
],
},
{
« no previous file with comments | « no previous file | athena/content/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698