Remove the touch_bar_forward_declarations.

Those are needed when compiling against SDKs older than 10.12 or so,
but Chromium has compiled against the 10.14 SDK for a while.

Bug: 1044838
Change-Id: Id9a70aa1c702b0c1992963c1fbd0a2e26f8e07ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020805
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Auto-Submit: Avi Drissman <avi@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735445}

chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h

@@ -6,9 +6,7 @@
 #define CHROME_BROWSER_UI_COCOA_TOUCHBAR_BROWSER_WINDOW_DEFAULT_TOUCH_BAR_H_
 
 #import <Cocoa/Cocoa.h>
-
-#include "base/mac/availability.h"
-#import "ui/base/cocoa/touch_bar_forward_declarations.h"
+#include <os/availability.h>
 
 class BookmarkTabHelperObserver;
 class Browser;

chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller.h

@@ -6,9 +6,7 @@
 #define CHROME_BROWSER_UI_COCOA_TOUCHBAR_BROWSER_WINDOW_TOUCH_BAR_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
-
-#include "base/mac/availability.h"
-#import "ui/base/cocoa/touch_bar_forward_declarations.h"
+#include <os/availability.h>
 
 class Browser;
 @class BrowserWindowDefaultTouchBar;

chrome/browser/ui/cocoa/touchbar/credit_card_autofill_touch_bar_controller.h

@@ -7,8 +7,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "ui/base/cocoa/touch_bar_forward_declarations.h"
-
 namespace autofill {
 class AutofillPopupController;
 }
@@ -35,4 +33,4 @@ class AutofillPopupController;
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_TOUCHBAR_CREDIT_CARD_AUTOFILL_TOUCH_BAR_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TOUCHBAR_CREDIT_CARD_AUTOFILL_TOUCH_BAR_CONTROLLER_H_
\ No newline at end of file

chrome/browser/ui/cocoa/touchbar/credit_card_autofill_touch_bar_controller.mm

@@ -12,7 +12,6 @@
 #include "components/autofill/core/browser/ui/popup_item_ids.h"
 #include "components/autofill/core/browser/ui/suggestion.h"
 #include "components/grit/components_scaled_resources.h"
-#import "ui/base/cocoa/touch_bar_forward_declarations.h"
 #import "ui/base/cocoa/touch_bar_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_util_mac.h"

chrome/browser/ui/cocoa/touchbar/web_textfield_touch_bar_controller.h

@@ -10,7 +10,6 @@
 #include <memory>
 
 #import "base/mac/scoped_nsobject.h"
-#import "ui/base/cocoa/touch_bar_forward_declarations.h"
 
 @class BrowserWindowTouchBarController;
 @class CreditCardAutofillTouchBarController;

components/remote_cocoa/app_shim/bridged_content_view_touch_bar.mm

@@ -9,7 +9,6 @@
 #import "components/remote_cocoa/app_shim/bridged_content_view.h"
 #import "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"
 #include "components/remote_cocoa/common/native_widget_ns_window_host.mojom.h"
-#import "ui/base/cocoa/touch_bar_forward_declarations.h"
 
 namespace {
 

ui/base/BUILD.gn

@@ -281,8 +281,6 @@ jumbo_component("base") {
       "cocoa/text_services_context_menu.h",
       "cocoa/tool_tip_base_view.h",
       "cocoa/tool_tip_base_view.mm",
-      "cocoa/touch_bar_forward_declarations.h",
-      "cocoa/touch_bar_forward_declarations.mm",
       "cocoa/touch_bar_util.h",
       "cocoa/touch_bar_util.mm",
       "cocoa/tracking_area.h",

ui/base/cocoa/touch_bar_forward_declarations.h

-// Copyright 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.
-
-#ifndef UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
-#define UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
-
-// Once Chrome no longer supports OSX 10.12.0, this file can be deleted.
-#import <AppKit/AppKit.h>
-#import <Foundation/Foundation.h>
-
-#include "base/mac/availability.h"
-#include "ui/base/ui_base_export.h"
-
-#pragma clang assume_nonnull begin
-
-#if !defined(MAC_OS_X_VERSION_10_12_1)
-
-@class NSTouchBar, NSTouchBarItem;
-@protocol NSTouchBarDelegate;
-
-typedef float NSTouchBarItemPriority;
-static const NSTouchBarItemPriority NSTouchBarItemPriorityHigh = 1000;
-static const NSTouchBarItemPriority NSTouchBarItemPriorityNormal = 0;
-static const NSTouchBarItemPriority NSTouchBarItemPriorityLow = -1000;
-
-typedef NSString* NSTouchBarItemIdentifier;
-typedef NSString* NSTouchBarCustomizationIdentifier;
-
-@interface NSTouchBar : NSObject<NSCoding>
-
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-- (nullable instancetype)initWithCoder:(NSCoder*)aDecoder
-    NS_DESIGNATED_INITIALIZER;
-
-@property(copy, nullable)
-    NSTouchBarCustomizationIdentifier customizationIdentifier;
-@property(copy) NSArray* customizationAllowedItemIdentifiers;
-@property(copy) NSArray* customizationRequiredItemIdentifiers;
-@property(copy) NSArray* defaultItemIdentifiers;
-@property(copy, readonly) NSArray* itemIdentifiers;
-@property(copy, nullable) NSTouchBarItemIdentifier principalItemIdentifier;
-@property(copy) NSSet* templateItems;
-@property(nullable, weak) id<NSTouchBarDelegate> delegate;
-
-- (nullable __kindof NSTouchBarItem*)itemForIdentifier:
-    (NSTouchBarItemIdentifier)identifier;
-
-@property(readonly, getter=isVisible) BOOL visible;
-
-@end
-
-@interface NSTouchBarItem : NSObject<NSCoding>
-
-- (instancetype)initWithIdentifier:(NSTouchBarItemIdentifier)identifier
-    NS_DESIGNATED_INITIALIZER;
-- (nullable instancetype)initWithCoder:(NSCoder*)coder
-    NS_DESIGNATED_INITIALIZER;
-- (instancetype)init NS_UNAVAILABLE;
-
-@property(readonly, copy) NSTouchBarItemIdentifier identifier;
-@property NSTouchBarItemPriority visibilityPriority;
-@property(readonly, nullable) NSView* view;
-@property(readonly, nullable) NSViewController* viewController;
-@property(readonly, copy) NSString* customizationLabel;
-@property(readonly, getter=isVisible) BOOL visible;
-
-@end
-
-@interface NSGroupTouchBarItem : NSTouchBarItem
-
-+ (NSGroupTouchBarItem*)groupItemWithIdentifier:
-                            (NSTouchBarItemIdentifier)identifier
-                                          items:(NSArray*)items;
-
-@property(strong) NSTouchBar* groupTouchBar;
-@property(readwrite, copy, null_resettable) NSString* customizationLabel;
-
-@end
-
-@interface NSCustomTouchBarItem : NSTouchBarItem
-
-@property(readwrite, strong) __kindof NSView* view;
-@property(readwrite, strong, nullable)
-    __kindof NSViewController* viewController;
-@property(readwrite, copy, null_resettable) NSString* customizationLabel;
-
-@end
-
-@protocol NSTouchBarDelegate<NSObject>
-
-@optional
-- (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
-               makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier;
-@end
-
-#elif MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1
-
-// When compiling against the 10.12.1 SDK or later, just provide forward
-// declarations to suppress the partial availability warnings.
-
-@class NSCustomTouchBarItem;
-@class NSGroupTouchBarItem;
-@class NSTouchBar;
-@protocol NSTouchBarDelegate;
-@class NSTouchBarItem;
-
-@interface NSWindow (TouchBarSDK)
-@property(strong, readonly) NSTouchBar* touchBar API_AVAILABLE(macos(10.12.2));
-@end
-
-#endif  // MAC_OS_X_VERSION_10_12_1
-
-extern "C" {
-#if !defined(MAC_OS_X_VERSION_10_12_1) || \
-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1
-UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFixedSpaceSmall;
-UI_BASE_EXPORT extern NSString* const NSTouchBarItemIdentifierFlexibleSpace;
-#endif  // MAC_OS_X_VERSION_10_12_1
-}  // extern "C"
-
-#if !defined(MAC_OS_X_VERSION_10_12_2) || \
-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_2
-
-@interface NSTouchBar (SierraPointTwoSDK)
-@property(copy, nullable)
-    NSTouchBarItemIdentifier escapeKeyReplacementItemIdentifier;
-@end
-
-#endif  // MAC_OS_X_VERSION_10_12_2
-
-#pragma clang assume_nonnull end
-
-#endif  // UI_BASE_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_

ui/base/cocoa/touch_bar_forward_declarations.mm

-// Copyright 2017 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 "ui/base/cocoa/touch_bar_forward_declarations.h"
-
-#if !defined(MAC_OS_X_VERSION_10_12_1) || \
-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1
-NSString* const NSTouchBarItemIdentifierFixedSpaceSmall =
-    @"NSTouchBarItemIdentifierFixedSpaceSmall";
-NSString* const NSTouchBarItemIdentifierFlexibleSpace =
-    @"NSTouchBarItemIdentifierFlexibleSpace";
-#endif  // MAC_OS_X_VERSION_10_12_1