Commit 1cd5356f authored by Jérôme Lebel's avatar Jérôme Lebel Committed by Commit Bot

[iOS] Adding unified consent dir

Moving all files related to unified consent into:
ios/chrome/browser/ui/authentication/unified_consent/

Bug: 827072
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I36bbca2d9f3392da5243e524bdc2276ba35d906d
Reviewed-on: https://chromium-review.googlesource.com/1039187
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: default avatarMihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555375}
parent 805db97e
...@@ -16,8 +16,6 @@ source_set("authentication") { ...@@ -16,8 +16,6 @@ source_set("authentication") {
"authentication_ui_util.mm", "authentication_ui_util.mm",
"chrome_signin_view_controller.h", "chrome_signin_view_controller.h",
"chrome_signin_view_controller.mm", "chrome_signin_view_controller.mm",
"identity_picker_view.h",
"identity_picker_view.mm",
"re_signin_infobar_delegate.h", "re_signin_infobar_delegate.h",
"re_signin_infobar_delegate.mm", "re_signin_infobar_delegate.mm",
"resized_avatar_cache.h", "resized_avatar_cache.h",
...@@ -30,18 +28,12 @@ source_set("authentication") { ...@@ -30,18 +28,12 @@ source_set("authentication") {
"signin_confirmation_view_controller.mm", "signin_confirmation_view_controller.mm",
"signin_promo_view_mediator.h", "signin_promo_view_mediator.h",
"signin_promo_view_mediator.mm", "signin_promo_view_mediator.mm",
"unified_consent_coordinator.h",
"unified_consent_coordinator.mm",
"unified_consent_mediator.h",
"unified_consent_mediator.mm",
"unified_consent_view_controller.h",
"unified_consent_view_controller.mm",
] ]
deps = [ deps = [
":authentication_ui", ":authentication_ui",
"resources:identity_picker_view_arrow_down",
"resources:signin_confirmation_more", "resources:signin_confirmation_more",
"resources:signin_promo_close_gray", "resources:signin_promo_close_gray",
"unified_consent",
"//base", "//base",
"//components/consent_auditor", "//components/consent_auditor",
"//components/google/core/browser", "//components/google/core/browser",
...@@ -52,10 +44,8 @@ source_set("authentication") { ...@@ -52,10 +44,8 @@ source_set("authentication") {
"//components/strings", "//components/strings",
"//google_apis", "//google_apis",
"//ios/chrome/app/strings", "//ios/chrome/app/strings",
"//ios/chrome/app/theme",
"//ios/chrome/browser", "//ios/chrome/browser",
"//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state",
"//ios/chrome/browser/browsing_data",
"//ios/chrome/browser/consent_auditor", "//ios/chrome/browser/consent_auditor",
"//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars",
"//ios/chrome/browser/signin", "//ios/chrome/browser/signin",
...@@ -73,7 +63,6 @@ source_set("authentication") { ...@@ -73,7 +63,6 @@ source_set("authentication") {
"//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/images",
"//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/signin",
"//ios/third_party/material_components_ios", "//ios/third_party/material_components_ios",
"//ios/third_party/material_roboto_font_loader_ios",
"//ui/base", "//ui/base",
"//ui/gfx", "//ui/gfx",
"//url", "//url",
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#import "ios/chrome/browser/ui/authentication/authentication_ui_util.h" #import "ios/chrome/browser/ui/authentication/authentication_ui_util.h"
#include "ios/chrome/browser/ui/authentication/signin_account_selector_view_controller.h" #include "ios/chrome/browser/ui/authentication/signin_account_selector_view_controller.h"
#include "ios/chrome/browser/ui/authentication/signin_confirmation_view_controller.h" #include "ios/chrome/browser/ui/authentication/signin_confirmation_view_controller.h"
#include "ios/chrome/browser/ui/authentication/unified_consent_coordinator.h" #include "ios/chrome/browser/ui/authentication/unified_consent/unified_consent_coordinator.h"
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h" #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
#import "ios/chrome/browser/ui/commands/application_commands.h" #import "ios/chrome/browser/ui/commands/application_commands.h"
#import "ios/chrome/browser/ui/rtl_geometry.h" #import "ios/chrome/browser/ui/rtl_geometry.h"
......
# Copyright 2018 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("//build/config/chrome_build.gni")
source_set("unified_consent") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
"unified_consent_coordinator.h",
"unified_consent_coordinator.mm",
"unified_consent_mediator.h",
"unified_consent_mediator.mm",
]
deps = [
":unified_consent_ui",
"//base",
"//ios/chrome/browser",
"//ios/chrome/browser/signin",
"//ios/public/provider/chrome/browser/signin",
]
}
source_set("unified_consent_ui") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
"identity_picker_view.h",
"identity_picker_view.mm",
"unified_consent_view_controller.h",
"unified_consent_view_controller.mm",
]
deps = [
"resources:identity_picker_view_arrow_down",
"//base",
"//components/google/core/browser",
"//ios/chrome/app/strings",
"//ios/chrome/browser",
"//ios/chrome/browser/ui:ui_util",
"//ios/chrome/browser/ui/colors",
"//ios/chrome/browser/ui/util",
"//ios/chrome/browser/ui/util:constraints_ui",
"//ios/chrome/common",
"//ios/third_party/material_components_ios",
"//ui/base",
]
}
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_IDENTITY_PICKER_VIEW_H_ #ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_IDENTITY_PICKER_VIEW_H_
#define IOS_CHROME_BROWSER_UI_AUTHENTICATION_IDENTITY_PICKER_VIEW_H_ #define IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_IDENTITY_PICKER_VIEW_H_
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
@end @end
#endif // IOS_CHROME_BROWSER_UI_AUTHENTICATION_IDENTITY_PICKER_VIEW_H_ #endif // IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_IDENTITY_PICKER_VIEW_H_
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/ui/authentication/identity_picker_view.h" #import "ios/chrome/browser/ui/authentication/unified_consent/identity_picker_view.h"
#include "base/logging.h" #include "base/logging.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h" #import "ios/chrome/browser/ui/uikit_ui_util.h"
......
# Copyright 2018 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("//build/config/ios/asset_catalog.gni")
imageset("identity_picker_view_arrow_down") {
sources = [
"identity_picker_view_arrow_down.imageset/Contents.json",
"identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down.png",
"identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@2x.png",
"identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@3x.png",
]
}
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_COORDINATOR_H_ #ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_COORDINATOR_H_
#define IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_COORDINATOR_H_ #define IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_COORDINATOR_H_
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
...@@ -60,4 +60,4 @@ ...@@ -60,4 +60,4 @@
@end @end
#endif // IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_COORDINATOR_H_ #endif // IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_COORDINATOR_H_
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "ios/chrome/browser/ui/authentication/unified_consent_coordinator.h" #include "ios/chrome/browser/ui/authentication/unified_consent/unified_consent_coordinator.h"
#include "base/logging.h" #include "base/logging.h"
#import "ios/chrome/browser/ui/authentication/unified_consent_mediator.h" #import "ios/chrome/browser/ui/authentication/unified_consent/unified_consent_mediator.h"
#import "ios/chrome/browser/ui/authentication/unified_consent_view_controller.h" #import "ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support." #error "This file requires ARC support."
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_MEDIATOR_H_ #ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_MEDIATOR_H_
#define IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_MEDIATOR_H_ #define IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_MEDIATOR_H_
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
@end @end
#endif // IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_MEDIATOR_H_ #endif // IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_MEDIATOR_H_
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "ios/chrome/browser/ui/authentication/unified_consent_mediator.h" #include "ios/chrome/browser/ui/authentication/unified_consent/unified_consent_mediator.h"
#include "base/logging.h" #include "base/logging.h"
#import "ios/chrome/browser/chrome_browser_provider_observer_bridge.h" #import "ios/chrome/browser/chrome_browser_provider_observer_bridge.h"
#import "ios/chrome/browser/signin/chrome_identity_service_observer_bridge.h" #import "ios/chrome/browser/signin/chrome_identity_service_observer_bridge.h"
#include "ios/chrome/browser/ui/authentication/unified_consent_view_controller.h" #include "ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.h"
#import "ios/public/provider/chrome/browser/signin/chrome_identity.h" #import "ios/public/provider/chrome/browser/signin/chrome_identity.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_VIEW_CONTROLLER_H_
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
...@@ -66,4 +66,4 @@ ...@@ -66,4 +66,4 @@
@end @end
#endif // IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_VIEW_CONTROLLER_H_ #endif // IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_VIEW_CONTROLLER_H_
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/ui/authentication/unified_consent_view_controller.h" #import "ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.h"
#include "base/logging.h" #include "base/logging.h"
#include "components/google/core/browser/google_util.h" #include "components/google/core/browser/google_util.h"
#include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/application_context.h"
#import "ios/chrome/browser/ui/authentication/identity_picker_view.h" #import "ios/chrome/browser/ui/authentication/unified_consent/identity_picker_view.h"
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h" #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h" #import "ios/chrome/browser/ui/uikit_ui_util.h"
#import "ios/chrome/browser/ui/util/constraints_ui_util.h" #import "ios/chrome/browser/ui/util/constraints_ui_util.h"
......
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