Index: ui/views/views.gyp |
diff --git a/ui/views/views.gyp b/ui/views/views.gyp |
index 9efaf978fb9fa995a27ec29b5920c94f6135b257..958fa89e34bdbf541de03d452019b028303948a4 100644 |
--- a/ui/views/views.gyp |
+++ b/ui/views/views.gyp |
@@ -28,6 +28,7 @@ |
'../accessibility/accessibility.gyp:ax_gen', |
'../aura/aura.gyp:aura', |
'../base/strings/ui_strings.gyp:ui_strings', |
+ '../base/ui_base.gyp:ui_base', |
'../compositor/compositor.gyp:compositor', |
'../events/events.gyp:events', |
'../events/events.gyp:events_base', |
@@ -35,7 +36,6 @@ |
'../gfx/gfx.gyp:gfx_geometry', |
'../native_theme/native_theme.gyp:native_theme', |
'../resources/ui_resources.gyp:ui_resources', |
- '../ui.gyp:ui', |
'../wm/wm.gyp:wm_public', |
], |
'export_dependent_settings': [ |
@@ -550,11 +550,11 @@ |
'../../testing/gtest.gyp:gtest', |
'../aura/aura.gyp:aura', |
'../aura/aura.gyp:aura_test_support', |
+ '../base/ui_base.gyp:ui_base', |
'../compositor/compositor.gyp:compositor', |
'../events/events.gyp:events', |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
- '../ui.gyp:ui', |
'views', |
], |
'include_dirs': [ |
@@ -605,10 +605,10 @@ |
'../../skia/skia.gyp:skia', |
'../../testing/gtest.gyp:gtest', |
'../aura/aura.gyp:aura', |
+ '../base/ui_base.gyp:ui_base', |
'../events/events.gyp:events', |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
- '../ui.gyp:ui', |
'controls/webview/webview.gyp:webview', |
'views_test_support', |
'views', |
@@ -637,6 +637,7 @@ |
'../aura/aura.gyp:aura', |
'../aura/aura.gyp:aura_test_support', |
'../base/strings/ui_strings.gyp:ui_strings', |
+ '../base/ui_base.gyp:ui_base', |
'../compositor/compositor.gyp:compositor', |
'../compositor/compositor.gyp:compositor_test_support', |
'../events/events.gyp:events', |
@@ -644,7 +645,6 @@ |
'../gfx/gfx.gyp:gfx_geometry', |
'../resources/ui_resources.gyp:ui_resources', |
'../resources/ui_resources.gyp:ui_test_pak', |
- '../ui.gyp:ui', |
'../ui_unittests.gyp:ui_test_support', |
'../wm/wm.gyp:wm_public', |
'views', |
@@ -782,12 +782,12 @@ |
'../../third_party/icu/icu.gyp:icui18n', |
'../../third_party/icu/icu.gyp:icuuc', |
'../aura/aura.gyp:aura', |
+ '../base/ui_base.gyp:ui_base', |
'../events/events.gyp:events', |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
'../resources/ui_resources.gyp:ui_resources', |
'../resources/ui_resources.gyp:ui_test_pak', |
- '../ui.gyp:ui', |
'views', |
], |
'include_dirs': [ |
@@ -866,11 +866,11 @@ |
'../../base/base.gyp:base', |
'../../base/base.gyp:base_i18n', |
'../aura/aura.gyp:aura', |
+ '../base/ui_base.gyp:ui_base', |
'../compositor/compositor.gyp:compositor', |
'../compositor/compositor.gyp:compositor_test_support', |
'../gfx/gfx.gyp:gfx', |
'../resources/ui_resources.gyp:ui_test_pak', |
- '../ui.gyp:ui', |
'views', |
'views_examples_lib', |
'views_test_support', |
@@ -891,12 +891,12 @@ |
'../../third_party/icu/icu.gyp:icuuc', |
'../../url/url.gyp:url_lib', |
'../aura/aura.gyp:aura', |
+ '../base/ui_base.gyp:ui_base', |
'../events/events.gyp:events', |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
'../resources/ui_resources.gyp:ui_resources', |
'../resources/ui_resources.gyp:ui_test_pak', |
- '../ui.gyp:ui', |
'controls/webview/webview.gyp:webview', |
'views', |
'views_examples_lib', |
@@ -937,13 +937,13 @@ |
'../../third_party/icu/icu.gyp:icui18n', |
'../../third_party/icu/icu.gyp:icuuc', |
'../aura/aura.gyp:aura', |
+ '../base/ui_base.gyp:ui_base', |
'../compositor/compositor.gyp:compositor', |
'../events/events.gyp:events', |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
'../resources/ui_resources.gyp:ui_resources', |
'../resources/ui_resources.gyp:ui_test_pak', |
- '../ui.gyp:ui', |
'../wm/wm.gyp:wm_test_support', |
'views', |
'views_examples_with_content_lib', |