Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
diff --git a/ui/ui.target.darwin-mips.mk b/ui/ui.target.darwin-mips.mk
index ee21ebf..c840834 100644
--- a/ui/ui.target.darwin-mips.mk
+++ b/ui/ui.target.darwin-mips.mk
@@ -80,6 +80,7 @@
ui/base/ui_base_paths.cc \
ui/base/ui_base_switches.cc \
ui/base/ui_base_switches_util.cc \
+ ui/base/ui_base_types.cc \
ui/base/window_open_disposition.cc \
ui/gfx/android/device_display_info.cc \
ui/gfx/android/java_bitmap.cc \
@@ -142,6 +143,7 @@
ui/webui/jstemplate_builder.cc \
ui/webui/web_ui_util.cc \
ui/base/ime/composition_text.cc \
+ ui/base/ime/input_method_initializer.cc \
ui/base/ime/text_input_client.cc
@@ -183,6 +185,7 @@
MY_CFLAGS_C :=
MY_DEFS := \
+ '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \