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

Unified Diff: chrome/browser/fullscreen_chromeos_or_ozone.cc

Issue 2453703002: Prepare fullscreen_chromeos.cc to be used for ozone builds. (Closed)
Patch Set: Created 4 years, 2 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
« chrome/browser/BUILD.gn ('K') | « chrome/browser/fullscreen_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/fullscreen_chromeos_or_ozone.cc
diff --git a/chrome/browser/fullscreen_chromeos.cc b/chrome/browser/fullscreen_chromeos_or_ozone.cc
similarity index 82%
rename from chrome/browser/fullscreen_chromeos.cc
rename to chrome/browser/fullscreen_chromeos_or_ozone.cc
index 8deeb23685fb190283bf708db9d8c0139d6539c7..ecfe203966b7a1a833e64d9e597ed8d141ec6d8b 100644
--- a/chrome/browser/fullscreen_chromeos.cc
+++ b/chrome/browser/fullscreen_chromeos_or_ozone.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2016 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.
@@ -8,11 +8,15 @@
#include "chrome/browser/ui/ash/ash_util.h"
bool IsFullScreenMode() {
- if (chrome::IsRunningInMash()) {
+#if defined(USE_ASH)
sky 2016/10/26 17:37:15 I'm confused by what conditions this code would be
fwang 2016/10/31 11:38:49 Yes, USE_ASH is very confusing as ash can be built
+ if (chrome::IsRunningInMash())
+#endif
+ {
// TODO: http://crbug.com/640390.
NOTIMPLEMENTED();
return false;
}
+
// TODO(oshima): Fullscreen is per display state. Investigate
// and fix if necessary.
ash::RootWindowController* controller =
« chrome/browser/BUILD.gn ('K') | « chrome/browser/fullscreen_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698