| Index: chrome/chrome_browser_ui.gypi
|
| diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
|
| index 437905444b312e0792eda49f7e4a5306ca5f1ab0..78b617109e07cfea426051a0f282d54404306a5c 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',
|
| @@ -2178,6 +2178,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_controller.cc',
|
| + 'browser/ui/webui/mojo_web_ui_controller.h',
|
| + 'browser/ui/webui/mojo_web_ui_handler.h',
|
| 'browser/ui/webui/nacl_ui.cc',
|
| 'browser/ui/webui/nacl_ui.h',
|
| 'browser/ui/webui/net_export_ui.cc',
|
| @@ -2436,15 +2439,18 @@
|
| '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"', {
|
| 'dependencies': [
|
| 'browser_extensions',
|
| 'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
|
| + 'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
|
| 'common/extensions/api/api.gyp:chrome_api',
|
| 'debugger',
|
| 'installer_util',
|
| + '../mojo/mojo.gyp:mojo_common_lib',
|
| '../third_party/re2/re2.gyp:re2',
|
| '../components/components.gyp:autofill_content_risk_proto',
|
| '../device/bluetooth/bluetooth.gyp:device_bluetooth',
|
|
|