Remove fullscreen_chromeos.cc

Bug: none
Change-Id: Ie03afd866c41c5271a1031ce1f62fe517fed7990
Reviewed-on: https://chromium-review.googlesource.com/746994
Commit-Queue: Evan Stade <estade@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513286}

chrome/browser/BUILD.gn

@@ -460,8 +460,6 @@ split_static_library("browser") {
     "font_pref_change_notifier.h",
     "font_pref_change_notifier_factory.cc",
     "font_pref_change_notifier_factory.h",
-    "fullscreen.h",
-    "fullscreen_chromeos.cc",
     "fullscreen_mac.mm",
     "fullscreen_win.cc",
     "gcm/gcm_product_util.cc",
@@ -2766,6 +2764,7 @@ split_static_library("browser") {
     }
   } else {  # Non-ChromeOS.
     sources += [
+      "fullscreen.h",
       "policy/cloud/user_cloud_policy_manager_factory.cc",
       "policy/cloud/user_cloud_policy_manager_factory.h",
       "policy/cloud/user_policy_signin_service_base.cc",

chrome/browser/fullscreen.h

@@ -9,7 +9,8 @@
 
 #include "build/build_config.h"
 
-// |display_id| is used in OS_CHROMEOS build config only, ignored otherwise.
-bool IsFullScreenMode(int64_t display_id);
+// Safe to call from cross-platform code; implementation is different for each
+// platform. Not implemented on Chrome OS.
+bool IsFullScreenMode();
 
 #endif  // CHROME_BROWSER_FULLSCREEN_H_

chrome/browser/fullscreen_aurax11.cc

@@ -10,7 +10,7 @@
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 #include "ui/views/widget/widget.h"
 
-bool IsFullScreenMode(int64_t display_id) {
+bool IsFullScreenMode() {
   std::vector<aura::Window*> all_windows =
       views::DesktopWindowTreeHostX11::GetAllOpenWindows();
   // Only the topmost window is checked. This works fine in the most cases, but

chrome/browser/fullscreen_chromeos.cc

-// Copyright (c) 2013 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.
-
-#include "chrome/browser/fullscreen.h"
-
-#include "ash/root_window_controller.h"
-#include "ash/shell.h"
-#include "chrome/browser/ui/ash/ash_util.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
-
-bool IsFullScreenMode(int64_t display_id) {
-  if (ash_util::IsRunningInMash()) {
-    // TODO: http://crbug.com/640390.
-    NOTIMPLEMENTED();
-    return false;
-  }
-
-  for (ash::RootWindowController* controller :
-       ash::Shell::Get()->GetAllRootWindowControllers()) {
-    if (display::Screen::GetScreen()
-            ->GetDisplayNearestWindow(controller->GetRootWindow())
-            .id() == display_id) {
-      return controller && controller->GetWindowForFullscreenMode();
-    }
-  }
-
-  return false;
-}

chrome/browser/fullscreen_mac.mm

@@ -8,7 +8,7 @@
 
 #include "base/command_line.h"
 
-bool IsFullScreenMode(int64_t display_id) {
+bool IsFullScreenMode() {
   NSApplicationPresentationOptions options =
       [NSApp currentSystemPresentationOptions];
 

chrome/browser/fullscreen_win.cc

@@ -6,6 +6,6 @@
 
 #include "ui/base/fullscreen_win.h"
 
-bool IsFullScreenMode(int64_t display_id) {
+bool IsFullScreenMode() {
   return ui::IsFullScreenMode();
 }

chrome/browser/notifications/fullscreen_notification_blocker.cc

@@ -9,7 +9,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/fullscreen.h"
 #include "content/public/browser/notification_service.h"
-#include "ui/display/types/display_constants.h"
 #include "ui/message_center/notifier_settings.h"
 
 using message_center::NotifierId;
@@ -27,7 +26,7 @@ FullscreenNotificationBlocker::~FullscreenNotificationBlocker() {
 
 void FullscreenNotificationBlocker::CheckState() {
   bool was_fullscreen_mode = is_fullscreen_mode_;
-  is_fullscreen_mode_ = IsFullScreenMode(display::kInvalidDisplayId);
+  is_fullscreen_mode_ = IsFullScreenMode();
   if (is_fullscreen_mode_ != was_fullscreen_mode)
     NotifyBlockingStateChanged();
 }