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

Unified Diff: chrome/browser/BUILD.gn

Issue 2453703002: Prepare fullscreen_chromeos.cc to be used for ozone builds. (Closed)
Patch Set: Prepare fullscreen_chromeos.cc to be used for ozone builds. Created 4 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/fullscreen_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index fbcb0a7ad50ae5ac7520d9b897d5063b5b239d50..0fa9593adeba0a0c86dc68c1c607e741865b0cca 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -382,7 +382,6 @@ split_static_library("browser") {
"file_select_helper.h",
"file_select_helper_mac.mm",
"fullscreen.h",
- "fullscreen_chromeos.cc",
"fullscreen_mac.mm",
"fullscreen_win.cc",
"geolocation/chrome_access_token_store.cc",
@@ -3540,6 +3539,14 @@ split_static_library("browser") {
}
}
+ # Chrome built with 'use_ozone=true' runs today within the mash environment,
+ # so for now the chromeos/ash implementation is (ab)used.
+ # TODO(tonikitoo): Make sure this is factored out when http://crbug.com/585570
+ # is fixed.
+ if (is_chromeos || use_ozone) {
+ sources += [ "fullscreen_ash.cc" ]
+ }
+
if (android_java_ui) {
deps += [ "//third_party/WebKit/public:android_mojo_bindings" ]
}
« no previous file with comments | « no previous file | chrome/browser/fullscreen_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698