Commit 6dcaf80a authored by edchin's avatar edchin Committed by Commit Bot

Revert "[ios] Add ScreenTime overlay modality"

This reverts commit e413add4.

Reason for revert: This approach is wrong. A much simpler approach is now being implemented in 
https://chromium-review.googlesource.com/c/chromium/src/+/2391798

Original change's description:
> [ios] Add ScreenTime overlay modality
> 
> This is one of a series of CLs to implement ScreenTime.
> 
> This CL:
> * Adds a new overlay modality above the web content area for the
> ScreenTime blocking view overlay
> * Adds and integrates no-op supported overlay coordinator classes.
> 
> Bug: 1123704
> Change-Id: Idee3417df9dee7cd15b8fcc93e4ee6944a5e530e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386535
> Reviewed-by: Chris Lu <thegreenfrog@chromium.org>
> Commit-Queue: edchin <edchin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#803274}

TBR=michaeldo@chromium.org,edchin@chromium.org,thegreenfrog@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1123704
Change-Id: If19b96825b7788cbdaa77b8e505278d049807814
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2390839Reviewed-by: default avatarMike Dougherty <michaeldo@chromium.org>
Commit-Queue: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804470}
parent 379712bf
...@@ -14,9 +14,6 @@ enum class OverlayModality { ...@@ -14,9 +14,6 @@ enum class OverlayModality {
// Used to schedule overlay UI to be displayed modally over a WebState's // Used to schedule overlay UI to be displayed modally over a WebState's
// content area (i.e. present UI requested by script execution on a page). // content area (i.e. present UI requested by script execution on a page).
kWebContentArea, kWebContentArea,
// Used to schedule overlay UI to be displayed modally over a WebState's
// content area, above all other overlays in the web content area.
kScreenTime,
// Used to schedule overlay UI to display Infobar banners. This modality is // Used to schedule overlay UI to display Infobar banners. This modality is
// in front of the Browser view, allowing the banner to be displayed over the // in front of the Browser view, allowing the banner to be displayed over the
// toolbar. // toolbar.
......
...@@ -42,7 +42,6 @@ source_set("overlays") { ...@@ -42,7 +42,6 @@ source_set("overlays") {
"//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/fullscreen:feature_flags",
"//ios/chrome/browser/ui/overlays/infobar_banner", "//ios/chrome/browser/ui/overlays/infobar_banner",
"//ios/chrome/browser/ui/overlays/infobar_modal", "//ios/chrome/browser/ui/overlays/infobar_modal",
"//ios/chrome/browser/ui/overlays/screen_time",
"//ios/chrome/browser/ui/overlays/web_content_area", "//ios/chrome/browser/ui/overlays/web_content_area",
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
] ]
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#import "ios/chrome/browser/ui/overlays/infobar_modal/infobar_modal_supported_overlay_coordinator_classes.h" #import "ios/chrome/browser/ui/overlays/infobar_modal/infobar_modal_supported_overlay_coordinator_classes.h"
#import "ios/chrome/browser/ui/overlays/overlay_coordinator_factory+initialization.h" #import "ios/chrome/browser/ui/overlays/overlay_coordinator_factory+initialization.h"
#import "ios/chrome/browser/ui/overlays/overlay_request_coordinator.h" #import "ios/chrome/browser/ui/overlays/overlay_request_coordinator.h"
#import "ios/chrome/browser/ui/overlays/screen_time/screen_time_supported_overlay_coordinator_classes.h"
#import "ios/chrome/browser/ui/overlays/web_content_area/web_content_area_supported_overlay_coordinator_classes.h" #import "ios/chrome/browser/ui/overlays/web_content_area/web_content_area_supported_overlay_coordinator_classes.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
...@@ -45,10 +44,6 @@ ...@@ -45,10 +44,6 @@
supportedCoordinatorClasses = supportedCoordinatorClasses =
web_content_area::GetSupportedOverlayCoordinatorClasses(); web_content_area::GetSupportedOverlayCoordinatorClasses();
break; break;
case OverlayModality::kScreenTime:
supportedCoordinatorClasses =
screen_time::GetSupportedOverlayCoordinatorClasses();
break;
case OverlayModality::kInfobarBanner: case OverlayModality::kInfobarBanner:
supportedCoordinatorClasses = supportedCoordinatorClasses =
infobar_banner::GetSupportedOverlayCoordinatorClasses(); infobar_banner::GetSupportedOverlayCoordinatorClasses();
......
# Copyright 2020 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.
source_set("screen_time") {
public = [ "screen_time_supported_overlay_coordinator_classes.h" ]
sources = [ "screen_time_supported_overlay_coordinator_classes.mm" ]
configs += [ "//build/config/compiler:enable_arc" ]
deps = []
}
edchin@chromium.org
# TEAM: ios-directory-owners@chromium.org
# OS: iOS
\ No newline at end of file
// Copyright 2020 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.
#ifndef IOS_CHROME_BROWSER_UI_OVERLAYS_SCREEN_TIME_SCREEN_TIME_SUPPORTED_OVERLAY_COORDINATOR_CLASSES_H_
#define IOS_CHROME_BROWSER_UI_OVERLAYS_SCREEN_TIME_SCREEN_TIME_SUPPORTED_OVERLAY_COORDINATOR_CLASSES_H_
#import <Foundation/Foundation.h>
namespace screen_time {
// Returns the supported OverlayRequestCoordinator classes for
// OverlayModality::kScreenTime.
NSArray<Class>* GetSupportedOverlayCoordinatorClasses();
} // screen_time
#endif // IOS_CHROME_BROWSER_UI_OVERLAYS_SCREEN_TIME_SCREEN_TIME_SUPPORTED_OVERLAY_COORDINATOR_CLASSES_H_
// Copyright 2020 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.
#import "ios/chrome/browser/ui/overlays/screen_time/screen_time_supported_overlay_coordinator_classes.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
namespace screen_time {
NSArray<Class>* GetSupportedOverlayCoordinatorClasses() {
// TODO(crbug.com/1123696): Create ScreenTime coordinator.
return @[];
}
} // screen_time
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