Commit 6992f1f0 authored by tapted's avatar tapted Committed by Commit bot

Move mac_views_browser grit define out of tools/grit.

tools/grit used to add it, but it should move to chrome_grit_defines
instead to avoid a ui dependency there. It's currently breaking WebRTC.

It's currently used by chrome/app/theme/theme_resources.grd.

(ui_resources.grd might need it later, but it doesn't right now).

BUG=657244
TBR=scottmg@chromium.org, sky@chromium.org

Review-Url: https://codereview.chromium.org/2535753007
Cr-Commit-Position: refs/heads/master@{#435582}
parent 8c8664ee
......@@ -11,6 +11,7 @@ import("//media/media_options.gni")
import("//net/features.gni")
import("//ppapi/features/features.gni")
import("//printing/features/features.gni")
import("//ui/base/ui_features.gni")
# Please keep features in alphabetical order.
declare_args() {
......@@ -99,6 +100,7 @@ chrome_grit_defines = [
"enable_vr_shell=$enable_vr_shell",
"enable_webrtc=$enable_webrtc",
"enable_webvr=$enable_webvr",
"mac_views_browser=$mac_views_browser",
"safe_browsing_mode=$safe_browsing_mode",
"use_vulcanize=$use_vulcanize",
]
......@@ -92,7 +92,6 @@ import("//build/config/crypto.gni")
import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//third_party/closure_compiler/closure_args.gni")
import("//ui/base/ui_features.gni")
assert(!enable_resource_whitelist_generation || is_android,
"resource whitelist generation only works on android")
......@@ -259,12 +258,6 @@ if (enable_notifications) {
"enable_notifications",
]
}
if (mac_views_browser) {
grit_defines += [
"-D",
"mac_views_browser",
]
}
# TODO(aberent): Enable for other platforms once the build machines have
# Java on them (and hence can run the closure compiler).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment