diff options
36 files changed, 633 insertions, 60 deletions
@@ -20,7 +20,9 @@ group("root") { #"//base(//build/toolchain/nacl:x86_newlib)", "//cc", + "//chrome/browser", "//chrome/browser/devtools", + "//chrome/browser/ui", "//chrome/browser/ui/views", "//chrome/common", "//chrome/plugin", @@ -138,7 +140,9 @@ group("root") { if (is_android) { deps -= [ "//cc", + "//chrome/browser", # Blocked on content. "//chrome/browser/devtools", # Blocked on content. + "//chrome/browser/ui", # Blocked on content. "//chrome/browser/ui/views", # Blocked on content. "//chrome/common", # Blocked on content. "//chrome/plugin", # Blocked on content. diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 2efc46c..e56399d 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -74,7 +74,7 @@ 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], @@ -115,7 +115,7 @@ 'include_dirs': [ '..', '../skia/config', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/', ], 'sources': [ 'browser/aw_browser_context.cc', diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp index 567cc54..79d95ee 100644 --- a/apps/shell/app_shell.gyp +++ b/apps/shell/app_shell.gyp @@ -55,8 +55,8 @@ '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', ], 'pak_output': '<(PRODUCT_DIR)/app_shell.pak', diff --git a/ash/BUILD.gn b/ash/BUILD.gn new file mode 100644 index 0000000..32f92be --- /dev/null +++ b/ash/BUILD.gn @@ -0,0 +1,12 @@ +# 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. + +# TODO(GYP) this is a placeholder so that targets that depend on ash can get +# the resources generated. +group("ash") { + deps = [ + "//ash/resources", + "//ash/strings", + ] +} diff --git a/ash/ash.gyp b/ash/ash.gyp index 84aab64..9976671 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1058,7 +1058,7 @@ ['exclude', 'autoclick/autoclick_unittest.cc'], ], 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], diff --git a/ash/ash_strings.gyp b/ash/ash_strings.gyp index 6c81594..e71aa46 100644 --- a/ash/ash_strings.gyp +++ b/ash/ash_strings.gyp @@ -5,6 +5,7 @@ { 'targets': [ { + # GN version: //ash/strings 'target_name': 'ash_strings', 'type': 'none', 'variables': { diff --git a/ash/resources/BUILD.gn b/ash/resources/BUILD.gn new file mode 100644 index 0000000..bb7de97 --- /dev/null +++ b/ash/resources/BUILD.gn @@ -0,0 +1,9 @@ +# 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("//tools/grit/grit_rule.gni") + +grit("resources") { + source = "ash_resources.grd" +} diff --git a/ash/strings/BUILD.gn b/ash/strings/BUILD.gn new file mode 100644 index 0000000..9c4ab9f --- /dev/null +++ b/ash/strings/BUILD.gn @@ -0,0 +1,9 @@ +# 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("//tools/grit/grit_rule.gni") + +grit("strings") { + source = "../ash_strings.grd" +} diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index b0a8ab4..d0b3fd9 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -31,7 +31,6 @@ config("feature_flags") { # TODO(brettw) most of these need to be parameterized. defines = [ "CHROMIUM_BUILD", - "ENABLE_ONE_CLICK_SIGNIN", "ENABLE_NOTIFICATIONS", "ENABLE_EGLIMAGE=1", "ENABLE_BACKGROUND=1", @@ -181,6 +180,9 @@ config("feature_flags") { if (enable_google_now) { defines += [ "ENABLE_GOOGLE_NOW=1" ] } + if (enable_one_click_signin) { + defines += [ "ENABLE_ONE_CLICK_SIGNIN" ] + } } # Debug/release ---------------------------------------------------------------- diff --git a/build/config/features.gni b/build/config/features.gni index 07fd5a9..e6cbc0f 100644 --- a/build/config/features.gni +++ b/build/config/features.gni @@ -23,6 +23,12 @@ declare_args() { # Enables Native Client support. enable_nacl = (!is_ios && !is_android) + + # If debug_devtools is set to true, JavaScript files for DevTools are stored + # as is and loaded from disk. Otherwise, a concatenated file is stored in + # resources.pak. It is still possible to load JS files from disk by passing + # --debug-devtools cmdline switch. + debug_devtools = false } # Additional dependent variables ----------------------------------------------- @@ -144,3 +150,9 @@ enable_image_loader_extension = is_chromeos enable_remoting = !is_ios && !is_android enable_google_now = !is_ios && !is_android + +enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos) + +# Chrome OS: whether to also build the upcoming version of +# ChromeVox, which can then be enabled via a command-line switch. +enable_chromevox_next = false diff --git a/build/config/ui.gni b/build/config/ui.gni index 3e37d2d..b58d7ed 100644 --- a/build/config/ui.gni +++ b/build/config/ui.gni @@ -14,7 +14,7 @@ declare_args() { # Indicates if Ash is enabled. Ash is the Aura Shell which provides a # desktop-like environment for Aura. Requires use_aura = true - use_ash = is_win || is_chromeos + use_ash = is_win || is_linux # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux # that does not require X11. @@ -25,7 +25,7 @@ declare_args() { # Indicates if Aura is enabled. Aura is a low-level windowing library, sort # of a replacement for GDI or GTK. - use_aura = is_linux || use_ozone || is_win || is_chromeos || use_ash + use_aura = is_win || is_linux # XInput2 multitouch support. Zero means disabled, nonzero indicates the # minimum XI2 version. For example, use_xi2_mt=2 means XI2.2 or above. diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index 0e9c515..982a16d 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -31,6 +31,24 @@ group("extra_resources") { "//chrome/browser/resources:sync_internals_resources", "//chrome/browser/resources:translate_internals_resources", ] + if (!is_ios) { + deps += [ + "//chrome/browser/resources:component_extension_resources", + "//chrome/browser/resources:options_resources", + "//chrome/browser/resources:quota_internals_resources", + "//chrome/browser/resources:sync_file_system_internals_resources", + ] + } + + if (enable_chromevox_next) { + deps += [ + #'browser/resources/chromeos/chromevox2/chromevox.gyp:chromevox2', TODO(GYP) + ] + } else { + deps += [ + #'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox', TODO(GYP) + ] + } } # GYP version: chrome/chrome_resources.gyp:chrome_strings diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 321be2eb..13c7c01 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -121,7 +121,7 @@ static_library("browser") { # # These files are generated by GRIT. # '<(grit_out_dir)/grit/component_extension_resources_map.cc', # '<(grit_out_dir)/grit/theme_resources_map.cc', - # '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/grit/ui_resources_map.cc', + # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', # # # This file is generated by # # chrome/browser/metrics/variations/generate_resources_map.py diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn index aa53168..7df5d18 100644 --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn @@ -32,3 +32,26 @@ grit("translate_internals_resources") { source = "translate_internals_resources.grd" } +# GYP version: copy command of chrome_extra_resources +copy("extension_resource_demo") { + sources = [ "extension_resource/demo/library.js" ] + outputs = [ "$root_out_dir/resources/extension/demo/library.js" ] +} + +if (!is_ios) { + grit("component_extension_resources") { + source = "component_extension_resources.grd" + } + + grit("options_resources") { + source = "options_resources.grd" + } + + grit("quota_internals_resources") { + source = "quota_internals_resources.grd" + } + + grit("sync_file_system_internals_resources") { + source = "sync_file_system_internals_resources.grd" + } +} diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn new file mode 100644 index 0000000..0085688 --- /dev/null +++ b/chrome/browser/ui/BUILD.gn @@ -0,0 +1,422 @@ +# 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/crypto.gni") +import("//build/config/features.gni") +import("//build/config/ui.gni") + +gypi_values = exec_script( + "//build/gypi_to_gn.py", + [ rebase_path("../../chrome_browser_ui.gypi") ], + "scope", + [ "../../chrome_browser_ui.gypi" ]) + +static_library("ui") { + output_name = "browser_ui" + + sources = [] + defines = [] + libs = [] + forward_dependent_configs_from = [] + + configs += [ "//build/config/compiler:wexit_time_destructors" ] + + # Since browser and browser_ui actually depend on each other, + # we must omit the dependency from browser_ui to browser. + # However, this means browser_ui and browser should more or less + # have the same dependencies. Once browser_ui is untangled from + # browser, then we can clean up these dependencies. + deps = [ + # NOTE: New dependencies should generally be added in the OS!="ios" + # dependencies block below, rather than here. + "//base/allocator", + "//chrome:extra_resources", + "//chrome:resources", + "//chrome:strings", + "//chrome/app/resources:platform_locale_settings", + "//chrome/app/theme:theme_resources", + "//chrome/browser/history:in_memory_url_index_cache_proto", + "//chrome/browser/net:cert_logger_proto", + "//chrome/common", + "//chrome/common/net", + "//components/dom_distiller/core", + "//components/dom_distiller/webui", + "//components/feedback/proto", + "//components/resources", + "//components/strings", + "//content/public/browser", + "//content/public/common", + "//crypto", + "//skia", + "//sync", + "//third_party/cacheinvalidation", + "//third_party/icu", + "//third_party/libusb", + "//third_party/libxml", + "//third_party/zlib", + "//ui/accessibility", + "//ui/base", + "//ui/events", + "//ui/gfx", + "//ui/gfx/geometry", + "//ui/native_theme", + "//ui/resources", + "//ui/snapshot", + "//ui/strings", + #'chrome_browser_ui_views.gyp:browser_ui_views', TODO(GYP) + #'../components/components.gyp:auto_login_parser', TODO(GYP) + #'../components/components.gyp:invalidation', TODO(GYP) + #'../components/components.gyp:omaha_query_params', TODO(GYP) + #'../components/components.gyp:onc_component', TODO(GYP) + #'../components/components.gyp:password_manager_core_browser', TODO(GYP) + #'../ui/message_center/message_center.gyp:message_center', TODO(GYP) + ] + + forward_dependent_configs_from = [ + "//components/dom_distiller/core", + "//sync", + ] + + if (!is_ios) { + sources += rebase_path(gypi_values.chrome_browser_ui_non_ios_sources, + ".", "//chrome") + deps += [ + "//chrome/browser/performance_monitor", + "//chrome/browser/ui/webui/omnibox:mojo_bindings", + "//chrome/common/extensions/api:api", + "//components/autofill/content/browser:risk_proto", + "//mojo/system", + "//net:net_with_v8", + "//third_party/adobe/flash:flapper_version_h", + "//third_party/expat", + "//third_party/hunspell", + "//third_party/leveldatabase", + "//third_party/npapi", + "//third_party/re2", + "//ui/compositor", + "//ui/surface", + "//v8", + "//webkit:resources", + "//webkit/browser:storage", + "//webkit/common", + "//webkit/common:storage", + #'browser_extensions', TODO(GYP) + #'debugger', TODO(GYP) + #'installer_util', TODO(GYP) + #'../device/bluetooth/bluetooth.gyp:device_bluetooth', TODO(GYP) + #'../device/nfc/nfc.gyp:device_nfc', TODO(GYP) + #'../media/media.gyp:media', TODO(GYP) + #'../third_party/libjingle/libjingle.gyp:libjingle', TODO(GYP) + #'../ui/web_dialogs/web_dialogs.gyp:web_dialogs', TODO(GYP) + ] + # TODO(GYP) + #'defines': [ + # '<@(nacl_defines)', + #], + #'direct_dependent_settings': { + # 'defines': [ + # '<@(nacl_defines)', + # ], + # }, + } else { + # iOS. + sources += rebase_path(gypi_values.chrome_browser_ui_ios_sources, + ".", "//chrome") + deps += [ "//net" ] + } + + if (enable_printing != 0) { + deps += [ "//printing" ] + } + + if (enable_one_click_signin) { + sources += rebase_path( + gypi_values.chrome_browser_ui_one_click_signin_sources, + ".", "//chrome") + } + if (enable_task_manager) { + sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources, + ".", "//chrome") + if (!toolkit_views) { + sources -= [ "views/task_manager_view.cc" ] + } + } + if (!enable_nacl) { + sources += rebase_path(gypi_values.chrome_browser_ui_nacl_sources, + ".", "//chrome") + deps += [ + #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", TODO(GYP) + ] + } + if (debug_devtools) { + defines += [ "DEBUG_DEVTOOLS=1" ] + } + if (enable_configuration_policy) { + sources += rebase_path(gypi_values.chrome_browser_ui_policy_sources, + ".", "//chrome") + deps += [ "//components/policy" ] + } + if (enable_plugins) { + sources += rebase_path(gypi_values.chrome_browser_ui_plugin_sources, + ".", "//chrome") + deps += [ "//ppapi:ppapi_ipc" ] + } + if (safe_browsing_mode == 1) { + defines += [ "FULL_SAFE_BROWSING" ] + deps += [ + "//chrome/browser/safe_browsing:chunk_proto", + "//chrome/common/safe_browsing:proto", + "//chrome/browser/safe_browsing:report_proto", + ] + } + if (is_chromeos) { + sources += rebase_path(gypi_values.chrome_browser_ui_chromeos_sources, + ".", "//chrome") + deps += [ + #"browser_chromeos", TODO(GYP) + ] + } else { + sources += rebase_path(gypi_values.chrome_browser_ui_non_chromeos_sources, + ".", "//chrome") + } + if (use_cups) { + configs += [ "//printing:cups" ] + } + if (use_ash) { + sources += rebase_path(gypi_values.chrome_browser_ui_ash_sources, + ".", "//chrome") + deps += [ + "//ash", + #"../ash/ash.gyp:ash_with_content", TODO(GYP) + #"../ash/ash_strings.gyp:ash_strings", TODO(GYP) + ] + if (!is_chromeos) { + sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, + ".", "//chrome") + } + } else { # Not ash. + sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, + ".", "//chrome") + } + if (toolkit_views) { + sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, + ".", "//chrome") + if (!is_chromeos) { + sources += rebase_path( + gypi_values.chrome_browser_ui_views_non_chromeos_sources, + ".", "//chrome") + } + if (use_ash) { + sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, + ".", "//chrome") + } + } + if (use_aura && !use_ozone && is_desktop_linux) { + deps += [ + # gtk2 is the only component that can interact with gtk2 in our new + # world. + #'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', TODO(GYP) + "//build/config/linux:gio", + ] + } + if (is_win || is_mac || is_desktop_linux) { + sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, + ".", "//chrome") + } + if (is_chromeos || is_android) { + sources += rebase_path( + gypi_values.chrome_browser_ui_android_chromeos_sources, + ".", "//chrome") + } + if (use_aura) { + sources += rebase_path(gypi_values.chrome_browser_ui_aura_sources, + ".", "//chrome") + deps += [ + # aura uses some of ash resources. + #'../ash/ash_resources.gyp:ash_resources', TODO(GYP) + "//ui/aura", + "//ui/keyboard", + "//ui/keyboard:resources", + "//ui/wm", + ] + if (!is_chromeos) { + sources += rebase_path(gypi_values.chrome_browser_ui_aura_non_chromeos, + ".", "//chrome") + } + } else { # Non-Aura. + sources += rebase_path(gypi_values.chrome_browser_ui_non_aura_sources, + ".", "//chrome") + } + if (ui_compositor_image_transport) { + deps += [ "//ui/gl" ] + } + if (use_nss_certs) { + sources += rebase_path(gypi_values.chrome_browser_ui_nss_sources, + ".", "//chrome") + } + if (!enable_themes) { + sources -= [ "webui/theme_source.cc" ] + } + if (enable_printing == 1) { + sources += rebase_path(gypi_values.chrome_browser_ui_print_preview_sources, + ".", "//chrome") + } + if (is_linux || is_android) { + sources += rebase_path(gypi_values.chrome_browser_ui_android_linux_sources, + ".", "//chrome") + } + + if (is_android) { + deps += [ + "//crypto:platform", + #'../components/components.gyp:web_conten TODO(GYP)ts_delegate_android', + #'chrome_browser_jni_headers', TODO(GYP) + ] + deps -= [ + "//components/feedback/proto", + "//third_party/libusb", + "//ui/events", + #'chrome_browser_ui_views.gyp:browser_ui_views', TODO(GYP) + ] + sources += rebase_path(gypi_values.chrome_browser_ui_android_sources, + ".", "//chrome") + } else { # Non-Android. + sources += rebase_path(gypi_values.chrome_browser_ui_non_android_sources, + ".", "//chrome") + } + + if (is_mac) { + sources += rebase_path(gypi_values.chrome_browser_ui_mac_sources, + ".", "//chrome") + sources -= [ + # 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) + #'../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', TODO(GYP) + #'../third_party/molokocacao/molokocacao.gyp:molokocacao', TODO(GYP) + #'../third_party/mozilla/mozilla.gyp:mozilla', TODO(GYP) + ] + libs += [ "Quartz.framework" ] + # TODO(GYP) + #'actions': [ + # { + # # This action is used to extract the localization data from xib + # # files and generate table for the ui localizer from it. + # 'variables': { + # 'xib_localizer_tool_path': + # 'tools/build/mac/generate_localizer', + # }, + # 'includes': [ + # 'chrome_nibs.gypi', + # ], + # 'action_name': 'Process xibs for localization', + # 'inputs': [ + # '<(xib_localizer_tool_path)', + # '<@(mac_translated_xibs)', + # ], + # 'outputs': [ + # '<(INTERMEDIATE_DIR)/ui_localizer_table.h', + # ], + # 'action': ['<(xib_localizer_tool_path)', + # '<@(_outputs)', + # '<@(mac_translated_xibs)'], + # }, + #] + } else { # non-Mac. + sources += rebase_path(gypi_values.chrome_browser_ui_non_mac_sources, + ".", "//chrome") + } + + if (is_win) { + sources += rebase_path(gypi_values.chrome_browser_ui_win_sources, + ".", "//chrome") + deps += [ + "//third_party/wtl", + "//third_party/iaccessible2", + "//third_party/isimpledom", + #'installer_util_strings', TODO(GYP) + #'launcher_support', TODO(GYP) + #'metro_utils', TODO(GYP) + #'../google_update/google_update.gyp:google_update', TODO(GYP) + #'../ui/app_list/app_list.gyp:app_list', TODO(GYP) + #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) + #'../ui/views/views.gyp:views', TODO(GYP) + ] + forward_dependent_configs_from += [ + #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) + #'../ui/views/views.gyp:views', TODO(GYP) + ] + } else { # 'OS!="win" + if (use_aura) { + deps += [ + #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) + #'../ui/views/views.gyp:views', TODO(GYP) + ] + } + } + if (is_desktop_linux) { + sources += rebase_path(gypi_values.chrome_browser_desktop_linux_sources, + ".", "//chrome") + } + if (is_linux) { # Both desktop Linux and ChromeOS. + sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources, + ".", "//chrome") + configs += [ "//build/config/linux:udev" ] + if (use_aura) { + configs += [ "//build/config/linux:fontconfig" ] + deps += [ "//dbus" ] + } + if (use_x11) { + sources += rebase_path(gypi_values.chrome_browser_ui_x11_sources, + ".", "//chrome") + configs += [ "//build/config/linux:x11" ] + } + } + + if (enable_app_list) { + sources += rebase_path(gypi_values.chrome_browser_ui_app_list_sources, + ".", "//chrome") + #deps += [ '../ui/app_list/app_list.gyp:app_list' ] TODO(GYP) + } else { + sources += rebase_path(gypi_values.chrome_browser_ui_non_app_list_sources, + ".", "//chrome") + } + if (enable_autofill_dialog) { + sources += rebase_path( + gypi_values.chrome_browser_ui_autofill_dialog_sources, + ".", "//chrome") + if (!is_android && !is_ios) { + sources += rebase_path( + gypi_values.chrome_browser_ui_autofill_dialog_non_mobile_sources, + ".", "//chrome") + deps += [ + "//third_party/libaddressinput", + "//third_party/libaddressinput:strings", + ] + } + } + if (enable_google_now && !is_android) { + sources += rebase_path( + gypi_values.chrome_browser_ui_google_now_non_android_sources, + ".", "//chrome") + } + if (enable_webrtc) { + sources += rebase_path(gypi_values.chrome_browser_ui_webrtc_sources, + ".", "//chrome") + } + if (enable_service_discovery) { + sources += rebase_path( + gypi_values.chrome_browser_ui_service_discovery_sources, + ".", "//chrome") + } + if (enable_spellcheck) { + deps += [ "//third_party/hunspell" ] + } +} + diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.cc b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.cc index a02b667..ce54c00 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.cc @@ -13,7 +13,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "grit/sync_file_system_internals_resources.h" -#include "ui/ui_resources/grit/ui_resources.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 784fb33..11698a0 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2974,7 +2974,7 @@ # These files are generated by GRIT. '<(grit_out_dir)/grit/component_extension_resources_map.cc', '<(grit_out_dir)/grit/theme_resources_map.cc', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/grit/ui_resources_map.cc', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', # This file is generated by # chrome/browser/metrics/variations/generate_resources_map.py diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 9d1413e..83b4415 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -790,8 +790,6 @@ 'browser/ui/global_error/global_error_service_factory.h', 'browser/ui/host_desktop.cc', 'browser/ui/host_desktop.h', - 'browser/ui/hung_plugin_tab_helper.cc', - 'browser/ui/hung_plugin_tab_helper.h', 'browser/ui/login/login_interstitial_delegate.cc', 'browser/ui/login/login_interstitial_delegate.h', 'browser/ui/login/login_prompt.cc', @@ -1080,8 +1078,6 @@ 'browser/ui/webui/invalidations_message_handler.h', 'browser/ui/webui/invalidations_ui.cc', 'browser/ui/webui/invalidations_ui.h', - 'browser/ui/webui/media/webrtc_logs_ui.cc', - 'browser/ui/webui/media/webrtc_logs_ui.h', 'browser/ui/webui/memory_internals/memory_internals_handler.cc', 'browser/ui/webui/memory_internals/memory_internals_handler.h', 'browser/ui/webui/memory_internals/memory_internals_proxy.cc', @@ -1145,7 +1141,6 @@ 'browser/ui/zoom/zoom_event_manager.cc', 'browser/ui/zoom/zoom_event_manager.h', 'browser/ui/zoom/zoom_observer.h', - '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.cc', ], # Note that we assume app list is enabled on all views builds, so the # views-specific app list files are in the views section. @@ -2040,16 +2035,10 @@ 'browser/ui/views/find_bar_view.h', 'browser/ui/views/first_run_bubble.cc', 'browser/ui/views/first_run_bubble.h', - 'browser/ui/views/frame/browser_frame_ash.cc', - 'browser/ui/views/frame/browser_frame_ash.h', 'browser/ui/views/frame/browser_frame.cc', 'browser/ui/views/frame/browser_frame_common_win.cc', 'browser/ui/views/frame/browser_frame_common_win.h', 'browser/ui/views/frame/browser_frame.h', - 'browser/ui/views/frame/browser_header_painter_ash.cc', - 'browser/ui/views/frame/browser_header_painter_ash.h', - 'browser/ui/views/frame/browser_non_client_frame_view_ash.cc', - 'browser/ui/views/frame/browser_non_client_frame_view_ash.h', 'browser/ui/views/frame/browser_non_client_frame_view.cc', 'browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc', 'browser/ui/views/frame/browser_non_client_frame_view.h', @@ -2068,8 +2057,6 @@ 'browser/ui/views/frame/contents_layout_manager.h', 'browser/ui/views/frame/contents_web_view.cc', 'browser/ui/views/frame/contents_web_view.h', - 'browser/ui/views/frame/immersive_mode_controller_ash.cc', - 'browser/ui/views/frame/immersive_mode_controller_ash.h', 'browser/ui/views/frame/immersive_mode_controller.cc', 'browser/ui/views/frame/immersive_mode_controller_factory.cc', 'browser/ui/views/frame/immersive_mode_controller.h', @@ -2078,10 +2065,8 @@ 'browser/ui/views/frame/minimize_button_metrics_win.cc', 'browser/ui/views/frame/minimize_button_metrics_win.h', 'browser/ui/views/frame/native_browser_frame_factory.cc', - 'browser/ui/views/frame/native_browser_frame_factory.cc', - 'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc', - 'browser/ui/views/frame/native_browser_frame_factory.h', 'browser/ui/views/frame/native_browser_frame_factory.h', + 'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc', 'browser/ui/views/frame/native_browser_frame.h', 'browser/ui/views/frame/opaque_browser_frame_view_layout.cc', 'browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h', @@ -2090,8 +2075,6 @@ 'browser/ui/views/frame/opaque_browser_frame_view_linux.h', 'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc', 'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h', - 'browser/ui/views/frame/scroll_end_effect_controller_ash.cc', - 'browser/ui/views/frame/scroll_end_effect_controller_ash.h', 'browser/ui/views/frame/scroll_end_effect_controller.h', 'browser/ui/views/frame/system_menu_insertion_delegate_win.cc', 'browser/ui/views/frame/system_menu_insertion_delegate_win.h', @@ -2269,11 +2252,9 @@ 'browser/ui/views/tabs/tab_strip.cc', 'browser/ui/views/tabs/tab_strip_controller.h', 'browser/ui/views/tabs/tab_strip.h', - 'browser/ui/views/tabs/window_finder_ash.cc', 'browser/ui/views/tabs/window_finder_chromeos.cc', 'browser/ui/views/tabs/window_finder.h', 'browser/ui/views/tabs/window_finder_win.cc', - 'browser/ui/views/task_manager_view.cc', 'browser/ui/views/theme_image_mapper_chromeos.cc', 'browser/ui/views/theme_image_mapper_desktop.cc', 'browser/ui/views/theme_image_mapper.h', @@ -2404,8 +2385,6 @@ 'browser/ui/ash/launcher/browser_status_monitor.h', 'browser/ui/ash/launcher/chrome_launcher_app_menu_item.cc', 'browser/ui/ash/launcher/chrome_launcher_app_menu_item.h', - 'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc', - 'browser/ui/bookmarks/bookmark_tab_helper_delegate.h', 'browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc', 'browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h', 'browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.cc', @@ -2472,6 +2451,20 @@ 'chrome_browser_ui_non_ash_sources': [ 'browser/ui/views/touch_uma/touch_uma.cc', ], + # Ash + Views. + 'chrome_browser_ui_ash_views_sources': [ + 'browser/ui/views/frame/browser_frame_ash.cc', + 'browser/ui/views/frame/browser_frame_ash.h', + 'browser/ui/views/frame/browser_header_painter_ash.cc', + 'browser/ui/views/frame/browser_header_painter_ash.h', + 'browser/ui/views/frame/browser_non_client_frame_view_ash.cc', + 'browser/ui/views/frame/browser_non_client_frame_view_ash.h', + 'browser/ui/views/frame/immersive_mode_controller_ash.cc', + 'browser/ui/views/frame/immersive_mode_controller_ash.h', + 'browser/ui/views/frame/scroll_end_effect_controller_ash.cc', + 'browser/ui/views/frame/scroll_end_effect_controller_ash.h', + 'browser/ui/views/tabs/window_finder_ash.cc', + ], # Used when Ash is enabled but not ChromeOS. 'chrome_browser_ui_ash_non_chromeos': [ 'browser/ui/ash/chrome_shell_delegate_views.cc', @@ -2595,7 +2588,10 @@ ], 'conditions': [ ['OS != "ios"', { - 'sources': [ '<@(chrome_browser_ui_non_ios_sources)' ], + 'sources': [ + '<@(chrome_browser_ui_non_ios_sources)', + '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.cc', + ], 'dependencies': [ 'browser_extensions', 'browser/performance_monitor/performance_monitor.gyp:performance_monitor', @@ -2716,6 +2712,9 @@ ['chromeos == 0', { 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], }], + ['use_ash == 1', { + 'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ], + }], ], }], ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 38ed0b5..33384cd 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -129,7 +129,7 @@ '../base/win/dllmain.cc', # Cursors. - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index e7ed2cd..6fafa7b 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -6,7 +6,7 @@ 'variables': { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', '<(grit_out_dir)/renderer_resources_100_percent.pak', '<(grit_out_dir)/theme_resources_100_percent.pak', ], diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi index dcb354f..e903d6b 100644 --- a/chrome/chrome_repack_chrome_200_percent.gypi +++ b/chrome/chrome_repack_chrome_200_percent.gypi @@ -6,7 +6,7 @@ 'variables': { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak', '<(grit_out_dir)/renderer_resources_200_percent.pak', '<(grit_out_dir)/theme_resources_200_percent.pak', ], diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index 10f124d..1017625 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -8,7 +8,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', '<(grit_out_dir)/browser_resources.pak', '<(grit_out_dir)/common_resources.pak', '<(grit_out_dir)/invalidations_resources.pak', diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index edcbda1..a166312 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -84,6 +84,7 @@ ], 'actions': [ { + # GN version: //chrome/browser/resources:component_extension_resources 'action_name': 'generate_component_extension_resources', 'variables': { 'grit_grd_file': 'browser/resources/component_extension_resources.grd', @@ -91,6 +92,7 @@ 'includes': [ '../build/grit_action.gypi' ], }, { + # GN version: //chrome/browser/resources:options_resources 'action_name': 'generate_options_resources', 'variables': { 'grit_grd_file': 'browser/resources/options_resources.grd', @@ -98,6 +100,7 @@ 'includes': [ '../build/grit_action.gypi' ], }, { + # GN version: //chrome/browser/resources:quota_internals_resources 'action_name': 'generate_quota_internals_resources', 'variables': { 'grit_grd_file': 'browser/resources/quota_internals_resources.grd', @@ -105,6 +108,7 @@ 'includes': [ '../build/grit_action.gypi' ], }, { + # GN version: //chrome/browser/resources:sync_file_system_internals_resources 'action_name': 'generate_sync_file_system_internals_resources', 'variables': { 'grit_grd_file': 'browser/resources/sync_file_system_internals_resources.grd', @@ -114,6 +118,7 @@ ], 'copies': [ { + # GN version: //chrome/browser/resources:extension_resource_demo 'destination': '<(PRODUCT_DIR)/resources/extension/demo', 'files': [ 'browser/resources/extension_resource/demo/library.js', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 1fd051d..4133d9f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -337,7 +337,7 @@ # but that causes errors in other targets when # resulting .res files get referenced multiple times. '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', 'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc', ], @@ -1848,7 +1848,7 @@ ['OS=="win"', { 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -2170,7 +2170,7 @@ ['OS=="win"', { 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -2457,7 +2457,7 @@ ['OS=="win"', { 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 0e42b5c..489a884 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2530,7 +2530,7 @@ # resulting .res files get referenced multiple times. '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', ], 'link_settings': { 'libraries': [ diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py index f837d2a..3d0a44d 100755 --- a/chrome/tools/build/repack_locales.py +++ b/chrome/tools/build/repack_locales.py @@ -89,8 +89,8 @@ def calc_inputs(locale): inputs.append(os.path.join(SHARE_INT_DIR, 'webkit', 'webkit_strings_%s.pak' % locale)) - #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings_da.pak', - inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'ui_strings', + #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/strings_da.pak', + inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings', 'ui_strings_%s.pak' % locale)) #e.g. '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings/ diff --git a/components/BUILD.gn b/components/BUILD.gn index 56ae457..9168a30 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -12,10 +12,11 @@ group("all_components") { "//components/autofill/content/common", "//components/autofill/content/renderer", "//components/cloud_devices/common", - "//components/dom_distiller/core", "//components/domain_reliability", + "//components/dom_distiller/core", "//components/favicon_base", "//components/favicon/core", + "//components/feedback", "//components/history/core/browser", "//components/history/core/common", "//components/history/core/test", @@ -63,6 +64,7 @@ group("all_components") { "//components/domain_reliability", # Blocked on content. "//components/favicon_base", # Should work, needs checking. "//components/favicon/core", # Blocked on keyed service. + "//components/feedback", # Blocked on content. "//components/history/core/browser", # Should work, needs checking. "//components/history/core/common", # Should work, needs checking. "//components/history/core/test", # Should work, needs checking. diff --git a/components/feedback.gypi b/components/feedback.gypi index 0dd7221..c6bbcde 100644 --- a/components/feedback.gypi +++ b/components/feedback.gypi @@ -45,6 +45,7 @@ }, { # Protobuf compiler / generate rule for feedback + # GN version: //components/feedback/proto 'target_name': 'feedback_proto', 'type': 'static_library', 'sources': [ diff --git a/components/feedback/BUILD.gn b/components/feedback/BUILD.gn new file mode 100644 index 0000000..aa8c864 --- /dev/null +++ b/components/feedback/BUILD.gn @@ -0,0 +1,37 @@ +# 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. + +static_library("feedback") { + sources = [ + "feedback_common.cc", + "feedback_common.h", + "feedback_data.cc", + "feedback_data.h", + "feedback_report.cc", + "feedback_report.h", + "feedback_switches.cc", + "feedback_switches.h", + "feedback_uploader.cc", + "feedback_uploader.h", + "feedback_uploader_chrome.cc", + "feedback_uploader_chrome.h", + "feedback_uploader_delegate.cc", + "feedback_uploader_delegate.h", + "feedback_uploader_factory.cc", + "feedback_uploader_factory.h", + "feedback_util.cc", + "feedback_util.h", + "tracing_manager.cc", + "tracing_manager.h", + ] + + deps = [ + "//base", + "//components/keyed_service/core:core", + "//components/feedback/proto", + "//content/public/common", + "//net", + "//third_party/zlib:zip", + ] +} diff --git a/components/feedback/proto/BUILD.gn b/components/feedback/proto/BUILD.gn new file mode 100644 index 0000000..15da2c0 --- /dev/null +++ b/components/feedback/proto/BUILD.gn @@ -0,0 +1,18 @@ +# 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("//third_party/protobuf/proto_library.gni") + +# GYP version: components/feedback.gypi:feedback_proto +proto_library("proto") { + sources = [ + "annotations.proto", + "chrome.proto", + "common.proto", + "dom.proto", + "extension.proto", + "math.proto", + "web.proto", + ] +} diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index cd215e5..86066df 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -80,7 +80,7 @@ source_set("browser") { "$root_gen_dir/webkit/grit/devtools_resources_map.cc", "$root_gen_dir/webkit/grit/devtools_resources_map.h", "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h", - "$root_gen_dir/ui/ui_resources/grit/webui_resources_map.cc", + "$root_gen_dir/ui/resources/grit/webui_resources_map.cc", "$root_gen_dir/content/browser/devtools/devtools_protocol_constants.cc", "$root_gen_dir/content/browser/devtools/devtools_protocol_constants.h", ], ".") diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 16379f0..58e0b45 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1327,7 +1327,7 @@ '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.cc', '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.h', '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/grit/tracing_resources.h', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/grit/webui_resources_map.cc', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc', # These files are generated by devtools_protocol_constants_generator.py. '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.cc', '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.h', diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 06fb912..b15570b 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -465,9 +465,9 @@ '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', diff --git a/printing/BUILD.gn b/printing/BUILD.gn index b6f3763..04b2b9a 100644 --- a/printing/BUILD.gn +++ b/printing/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/features.gni") import("//build/config/ui.gni") if (is_mac) { import("//build/config/mac/mac_sdk.gni") @@ -10,8 +11,6 @@ if (is_android) { import("//build/config/android/rules.gni") } -use_cups = ((is_linux && !is_chromeos) || is_mac) - component("printing") { sources = [ "backend/print_backend.cc", diff --git a/ui/resources/ui_resources.gyp b/ui/resources/ui_resources.gyp index 427870f..7f97865 100644 --- a/ui/resources/ui_resources.gyp +++ b/ui/resources/ui_resources.gyp @@ -9,7 +9,7 @@ 'target_name': 'ui_resources', 'type': 'none', 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources', + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/resources', }, 'actions': [ { @@ -53,9 +53,9 @@ 'variables': { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', ], 'pak_output': '<(PRODUCT_DIR)/ui_test.pak', }, @@ -69,7 +69,7 @@ # GN version //ui/resources:copy_ui_resources_100_percent 'destination': '<(PRODUCT_DIR)/ui', 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', ], }, ], diff --git a/ui/strings/ui_strings.gyp b/ui/strings/ui_strings.gyp index 02ae903..69b2e80 100644 --- a/ui/strings/ui_strings.gyp +++ b/ui/strings/ui_strings.gyp @@ -16,7 +16,7 @@ 'action_name': 'ui_strings', 'variables': { 'grit_grd_file': 'ui_strings.grd', - 'grit_out_dir': '<(grit_base_out_dir)/ui_strings', + 'grit_out_dir': '<(grit_base_out_dir)/strings', }, 'includes': [ '../../build/grit_action.gypi' ], }, @@ -32,7 +32,7 @@ 'direct_dependent_settings': { 'include_dirs': [ '<(grit_base_out_dir)/app_locale_settings', - '<(grit_base_out_dir)/ui_strings', + '<(grit_base_out_dir)/strings', ], }, }, |