GN: Add //ui/base/ime, fix up printing on mac

This adds the //ui/base/ime target to the GN build, which is used
everywhere except for ios. In the gyp build this isn't a real target,
it's a set of properties that are included into the ui_base target which
is the best you can do in GYP since you can't link a static library into
a component without dropping some symbols. In GN, we can define this as
a source_set with its own dependencies and settings.

This also fixes up some miscellaneous mac issues.

R=brettw@chromium.org,ben@chromium.org

Review URL: https://codereview.chromium.org/389083002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284981 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/BUILD.gn

@@ -293,8 +293,6 @@ static_library("ui") {
       # Mac has its own way of drawing tabs.
       "tabs/tab_resources.cc",
       "tabs/tab_resources.h",
-      "views/extensions/extension_view_views.cc",
-      "views/extensions/extension_view_views.h",
     ]
     deps += [
       #'../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code',  TODO(GYP)

chrome/chrome_common.gypi

@@ -484,7 +484,6 @@
             '<(DEPTH)/breakpad/src',
           ],
           'sources!': [
-            'common/child_process_logging_posix.cc',
             'common/chrome_version_info_posix.cc',
           ],
         }],

chrome/common/BUILD.gn

@@ -194,7 +194,6 @@ static_library("common") {
 
   if (is_mac) {
     sources -= [
-      "child_process_logging_posix.cc",
       "chrome_version_info_posix.cc",
     ]
     deps += [

components/storage_monitor/BUILD.gn

@@ -47,7 +47,7 @@ static_library("storage_monitor") {
   ]
 
   if (is_mac) {
-    libs += [
+    libs = [
       "DiskArbitration.framework",
       "Foundation.framework",
       "ImageCaptureCore.framework",

media/audio/BUILD.gn

@@ -182,7 +182,7 @@ source_set("audio") {
   }
 
   if (use_alsa) {
-    libs = [ "asound" ]
+    libs += [ "asound" ]
     defines = [ "USE_ALSA" ]
     sources += [
       "alsa/alsa_input.cc",

printing/BUILD.gn

@@ -226,7 +226,7 @@ if (use_cups) {
     defines = [ "USE_CUPS" ]
 
     if (is_mac) {
-      libs = [ "libcups.dylib" ]
+      ldflags = [ "$mac_sdk_path/usr/lib/libcups.dylib" ]
     } else {
       libs = exec_script("cups_config_helper.py", [ "--libs-for-gn" ], "value")
     }

sandbox/mac/BUILD.gn

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/mac/mac_sdk.gni")
+
 component("sandbox") {
   sources = [
     "bootstrap_sandbox.cc",

ui/base/BUILD.gn

@@ -135,69 +135,6 @@ component("base") {
     "dragdrop/os_exchange_data_provider_win.cc",
     "dragdrop/os_exchange_data_provider_win.h",
     "hit_test.h",
-    "ime/candidate_window.cc",
-    "ime/candidate_window.h",
-    "ime/chromeos/character_composer.cc",
-    "ime/chromeos/character_composer.h",
-    "ime/chromeos/ime_bridge.cc",
-    "ime/chromeos/ime_bridge.h",
-    "ime/chromeos/ime_keymap.cc",
-    "ime/chromeos/ime_keymap.h",
-    "ime/chromeos/mock_ime_candidate_window_handler.cc",
-    "ime/chromeos/mock_ime_candidate_window_handler.h",
-    "ime/chromeos/mock_ime_engine_handler.cc",
-    "ime/chromeos/mock_ime_engine_handler.h",
-    "ime/chromeos/mock_ime_input_context_handler.cc",
-    "ime/chromeos/mock_ime_input_context_handler.h",
-    "ime/composition_text.cc",
-    "ime/composition_text.h",
-    "ime/composition_text_util_pango.cc",
-    "ime/composition_text_util_pango.h",
-    "ime/composition_underline.h",
-    "ime/dummy_input_method_delegate.cc",
-    "ime/dummy_input_method_delegate.h",
-    "ime/infolist_entry.cc",
-    "ime/infolist_entry.h",
-    "ime/input_method.h",
-    "ime/input_method_auralinux.cc",
-    "ime/input_method_auralinux.h",
-    "ime/input_method_base.cc",
-    "ime/input_method_base.h",
-    "ime/input_method_chromeos.cc",
-    "ime/input_method_chromeos.h",
-    "ime/input_method_delegate.h",
-    "ime/input_method_factory.cc",
-    "ime/input_method_factory.h",
-    "ime/input_method_initializer.cc",
-    "ime/input_method_initializer.h",
-    "ime/input_method_mac.h",
-    "ime/input_method_mac.mm",
-    "ime/input_method_minimal.cc",
-    "ime/input_method_minimal.h",
-    "ime/input_method_observer.h",
-    "ime/input_method_win.cc",
-    "ime/input_method_win.h",
-    "ime/linux/fake_input_method_context.cc",
-    "ime/linux/fake_input_method_context.h",
-    "ime/linux/fake_input_method_context_factory.cc",
-    "ime/linux/fake_input_method_context_factory.h",
-    "ime/linux/linux_input_method_context.h",
-    "ime/linux/linux_input_method_context_factory.cc",
-    "ime/linux/linux_input_method_context_factory.h",
-    "ime/mock_input_method.cc",
-    "ime/mock_input_method.h",
-    "ime/remote_input_method_delegate_win.h",
-    "ime/remote_input_method_win.cc",
-    "ime/remote_input_method_win.h",
-    "ime/text_input_client.cc",
-    "ime/text_input_client.h",
-    "ime/text_input_focus_manager.cc",
-    "ime/text_input_focus_manager.h",
-    "ime/text_input_type.h",
-    "ime/win/imm32_manager.cc",
-    "ime/win/imm32_manager.h",
-    "ime/win/tsf_input_scope.cc",
-    "ime/win/tsf_input_scope.h",
     "l10n/formatter.cc",
     "l10n/formatter.h",
     "l10n/l10n_font_util.cc",
@@ -358,6 +295,8 @@ component("base") {
       "l10n/l10n_util_mac.h",
       "l10n/l10n_util_mac.mm",
     ]
+  } else {
+    deps += [ "//ui/base/ime" ]
   }
 
   if (toolkit_views) {
@@ -426,17 +365,6 @@ component("base") {
     }
   }
 
-  if (use_pango) {
-    configs += [
-      "//build/config/linux:pangocairo",
-    ]
-  } else {
-    sources -= [
-      "ime/composition_text_util_pango.cc",
-      "ime/composition_text_util_pango.h",
-    ]
-  }
-
   if (is_chromeos || (use_aura && is_linux && !use_x11)) {
     sources += [
       "dragdrop/os_exchange_data_provider_aura.cc",
@@ -488,6 +416,8 @@ component("base") {
     ]
 
     sources -= [
+      "cursor/image_cursors.cc",
+      "cursor/image_cursors.h",
       "dragdrop/drag_utils.cc",
       "dragdrop/drag_utils.h",
     ]

ui/base/ime/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ui.gni")
+
+source_set("ime") {
+  # GYP version: ui/base/ime/ime.gypi, which is included into ui_base
+  sources = [
+    "candidate_window.cc",
+    "candidate_window.h",
+    "chromeos/character_composer.cc",
+    "chromeos/character_composer.h",
+    "chromeos/ime_bridge.cc",
+    "chromeos/ime_bridge.h",
+    "chromeos/ime_keymap.cc",
+    "chromeos/ime_keymap.h",
+    "chromeos/mock_ime_candidate_window_handler.cc",
+    "chromeos/mock_ime_candidate_window_handler.h",
+    "chromeos/mock_ime_engine_handler.cc",
+    "chromeos/mock_ime_engine_handler.h",
+    "chromeos/mock_ime_input_context_handler.cc",
+    "chromeos/mock_ime_input_context_handler.h",
+    "composition_text.cc",
+    "composition_text.h",
+    "composition_text_util_pango.cc",
+    "composition_text_util_pango.h",
+    "composition_underline.h",
+    "dummy_input_method_delegate.cc",
+    "dummy_input_method_delegate.h",
+    "infolist_entry.cc",
+    "infolist_entry.h",
+    "input_method.h",
+    "input_method_auralinux.cc",
+    "input_method_auralinux.h",
+    "input_method_base.cc",
+    "input_method_base.h",
+    "input_method_chromeos.cc",
+    "input_method_chromeos.h",
+    "input_method_delegate.h",
+    "input_method_factory.cc",
+    "input_method_factory.h",
+    "input_method_initializer.cc",
+    "input_method_initializer.h",
+    "input_method_mac.h",
+    "input_method_mac.mm",
+    "input_method_minimal.cc",
+    "input_method_minimal.h",
+    "input_method_observer.h",
+    "input_method_win.cc",
+    "input_method_win.h",
+    "linux/fake_input_method_context.cc",
+    "linux/fake_input_method_context.h",
+    "linux/fake_input_method_context_factory.cc",
+    "linux/fake_input_method_context_factory.h",
+    "linux/linux_input_method_context.h",
+    "linux/linux_input_method_context_factory.cc",
+    "linux/linux_input_method_context_factory.h",
+    "mock_input_method.cc",
+    "mock_input_method.h",
+    "remote_input_method_delegate_win.h",
+    "remote_input_method_win.cc",
+    "remote_input_method_win.h",
+    "text_input_client.cc",
+    "text_input_client.h",
+    "text_input_focus_manager.cc",
+    "text_input_focus_manager.h",
+    "text_input_type.h",
+    "win/imm32_manager.cc",
+    "win/imm32_manager.h",
+    "win/tsf_input_scope.cc",
+    "win/tsf_input_scope.h",
+  ]
+
+  defines = [ "UI_BASE_IMPLEMENTATION" ]
+
+  deps = [
+    "//skia",
+    "//ui/events",
+  ]
+
+  if (!toolkit_views && !use_aura) {
+    sources -= [
+      "input_method_factory.cc",
+      "input_method_factory.h",
+      "input_method_minimal.cc",
+      "input_method_minimal.h",
+    ]
+  }
+  if (is_chromeos) {
+    deps += [
+      "//chromeos",
+    ]
+  }
+  if (!use_aura || (!is_linux && !use_ozone)) {
+    sources -= [
+      "input_method_auralinux.cc",
+      "input_method_auralinux.h",
+    ]
+  }
+  if (use_pango) {
+    configs += [ "//build/config/linux:pangocairo" ]
+  } else {
+    sources -= [
+      "composition_text_util_pango.cc",
+      "composition_text_util_pango.h",
+    ]
+  }
+
+  if (is_android) {
+    deps -= [ "//ui/events" ]
+  }
+}

ui/views/BUILD.gn

@@ -42,12 +42,6 @@ component("views") {
 
   forward_dependent_configs_from = [ "//ui/accessibility:ax_gen" ]
 
-  if (!use_ash) {
-    sources -= [
-      "bubble/tray_bubble_view.cc",
-      "bubble/tray_bubble_view.h",
-    ]
-  }
   if (use_x11 && !is_chromeos) {
     deps += [ "//ui/display/util" ]
   }