Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(407)

Unified Diff: chrome/browser/ui/BUILD.gn

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move to mojo::edk namespace in preparation for runtim flag Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index b3ad7434c5a467f53221e768f0e912d52ba1450f..864e43901c81383e25fc1780a323dc24d1556c9b 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -103,7 +103,6 @@ source_set("ui") {
"//third_party/WebKit/public:resources",
"//third_party/adobe/flash:flapper_version_h",
"//third_party/leveldatabase",
- "//third_party/mojo/src/mojo/edk/system",
"//third_party/libjingle",
"//third_party/re2",
"//ui/base/ime",
@@ -112,6 +111,12 @@ source_set("ui") {
"//ui/web_dialogs",
"//v8",
]
+
+ if (use_chrome_edk) {
+ deps += [ "//mojo/edk/system" ]
+ } else {
+ deps += [ "//third_party/mojo/src/mojo/edk/system" ]
+ }
} else {
# iOS.
sources +=
@@ -345,9 +350,7 @@ source_set("ui") {
if (is_win) {
sources +=
rebase_path(gypi_values.chrome_browser_ui_win_sources, ".", "//chrome")
- sources -= [
- "views/frame/taskbar_decorator.cc",
- ]
+ sources -= [ "views/frame/taskbar_decorator.cc" ]
public_deps += [
"//ui/views",
"//ui/views/controls/webview",

Powered by Google App Engine
This is Rietveld 408576698