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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 222543004: Makes chrome://omnibox use mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment Created 6 years, 9 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
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 4e90367ea11febb55549dd145583f6956b16b7a8..da72989691136e91df7ae5fe42bf9e56489b0c3d 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -25,10 +25,10 @@
'chrome_resources.gyp:theme_resources',
'common',
'common_net',
+ 'feedback_proto',
'in_memory_url_index_cache_proto',
'safe_browsing_proto',
'safe_browsing_report_proto',
- 'feedback_proto',
'../components/components.gyp:auto_login_parser',
'../components/components.gyp:dom_distiller_core',
'../components/components.gyp:dom_distiller_webui',
@@ -2434,6 +2434,9 @@
'browser/ui/webui/memory_internals/memory_internals_ui.h',
'browser/ui/webui/metrics_handler.cc',
'browser/ui/webui/metrics_handler.h',
+ 'browser/ui/webui/mojo_web_ui.h',
+ 'browser/ui/webui/mojo_web_ui_controller.cc',
+ 'browser/ui/webui/mojo_web_ui_controller.h',
'browser/ui/webui/nacl_ui.cc',
'browser/ui/webui/nacl_ui.h',
'browser/ui/webui/net_export_ui.cc',
@@ -2691,6 +2694,7 @@
'browser/ui/zoom/zoom_controller.cc',
'browser/ui/zoom/zoom_controller.h',
'browser/ui/zoom/zoom_observer.h',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.cc',
],
'conditions': [
['OS != "ios"', {
@@ -2742,6 +2746,23 @@
['include', '^browser/ui/profile_error_dialog\\.cc$'],
],
}],
+ ['use_mojo==1', {
+ 'dependencies': [
+ 'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
+ '../mojo/mojo.gyp:mojo_common_lib',
+ ],
+ }, { # use_mojo==0
+ 'sources!': [
+ 'browser/ui/webui/mojo_web_ui.h',
+ 'browser/ui/webui/mojo_web_ui_controller.cc',
+ 'browser/ui/webui/mojo_web_ui_controller.h',
+ 'browser/ui/webui/omnibox/omnibox_ui.cc',
+ 'browser/ui/webui/omnibox/omnibox_ui.h',
+ 'browser/ui/webui/omnibox/omnibox_ui_handler.cc',
+ 'browser/ui/webui/omnibox/omnibox_ui_handler.h',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.cc',
+ ],
+ }],
['enable_printing!=0', {
'dependencies': [
'../printing/printing.gyp:printing',

Powered by Google App Engine
This is Rietveld 408576698