Commit 9de1b156 authored by Javier Ernesto Flores Robles's avatar Javier Ernesto Flores Robles Committed by Commit Bot

[iOS] Move highlight_button to ui/elements

Bug: 1052505
Change-Id: Icef96c97f24aecf5eb17dddc24d7d73d1878355f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062973
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744602}
parent e9ce1827
...@@ -60,8 +60,8 @@ source_set("tabs") { ...@@ -60,8 +60,8 @@ source_set("tabs") {
"//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util",
"//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list",
"//ios/chrome/common", "//ios/chrome/common",
"//ios/chrome/common:common_extension",
"//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/colors",
"//ios/chrome/common/ui/elements",
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
"//ios/third_party/material_components_ios", "//ios/third_party/material_components_ios",
"//ios/web", "//ios/web",
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
#import "ios/chrome/browser/ui/image_util/image_util.h" #import "ios/chrome/browser/ui/image_util/image_util.h"
#include "ios/chrome/browser/ui/util/rtl_geometry.h" #include "ios/chrome/browser/ui/util/rtl_geometry.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h" #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/highlight_button.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h" #import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/elements/highlight_button.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h" #import "ios/chrome/common/ui/util/constraints_ui_util.h"
#include "ios/chrome/grit/ios_strings.h" #include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h" #import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
......
...@@ -75,8 +75,8 @@ source_set("translate_ui") { ...@@ -75,8 +75,8 @@ source_set("translate_ui") {
"//ios/chrome/browser/ui/translate/resources:translate_icon", "//ios/chrome/browser/ui/translate/resources:translate_icon",
"//ios/chrome/browser/ui/translate/resources:translate_options", "//ios/chrome/browser/ui/translate/resources:translate_options",
"//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util",
"//ios/chrome/common:common_extension", "//ios/chrome/common/ui/colors",
"//ios/chrome/common/ui/colors:colors", "//ios/chrome/common/ui/elements",
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
"//ios/third_party/material_components_ios", "//ios/third_party/material_components_ios",
"//ui/base", "//ui/base",
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#import "ios/chrome/browser/ui/translate/translate_infobar_language_tab_strip_view.h" #import "ios/chrome/browser/ui/translate/translate_infobar_language_tab_strip_view.h"
#import "ios/chrome/browser/ui/translate/translate_infobar_language_tab_view_delegate.h" #import "ios/chrome/browser/ui/translate/translate_infobar_language_tab_view_delegate.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h" #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/highlight_button.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h" #import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/elements/highlight_button.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h" #import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h" #import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
......
...@@ -31,19 +31,6 @@ source_set("common") { ...@@ -31,19 +31,6 @@ source_set("common") {
libs = [ "QuartzCore.framework" ] libs = [ "QuartzCore.framework" ]
} }
source_set("common_extension") {
sources = [
"highlight_button.h",
"highlight_button.mm",
]
libs = [ "UIKit.framework" ]
public_deps = [ ":timing" ]
configs += [ "//build/config/compiler:enable_arc" ]
}
source_set("timing") { source_set("timing") {
sources = [ sources = [
"material_timing.h", "material_timing.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("//build/buildflag_header.gni")
import("//build/config/ios/ios_sdk.gni")
source_set("elements") {
sources = [
"highlight_button.h",
"highlight_button.mm",
]
libs = [ "UIKit.framework" ]
deps = [ "//ios/chrome/common:timing" ]
configs += [ "//build/config/compiler:enable_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_COMMON_HIGHLIGHT_BUTTON_H_ #ifndef IOS_CHROME_COMMON_UI_ELEMENTS_HIGHLIGHT_BUTTON_H_
#define IOS_CHROME_COMMON_HIGHLIGHT_BUTTON_H_ #define IOS_CHROME_COMMON_UI_ELEMENTS_HIGHLIGHT_BUTTON_H_
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
@end @end
#endif // IOS_CHROME_COMMON_HIGHLIGHT_BUTTON_H_ #endif // IOS_CHROME_COMMON_UI_ELEMENTS_HIGHLIGHT_BUTTON_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/common/highlight_button.h" #import "ios/chrome/common/ui/elements/highlight_button.h"
#import "ios/chrome/common/material_timing.h" #import "ios/chrome/common/material_timing.h"
......
...@@ -52,10 +52,10 @@ source_set("content_widget") { ...@@ -52,10 +52,10 @@ source_set("content_widget") {
deps = [ deps = [
"//base", "//base",
"//ios/chrome/common:common_extension",
"//ios/chrome/common/app_group", "//ios/chrome/common/app_group",
"//ios/chrome/common/app_group:command", "//ios/chrome/common/app_group:command",
"//ios/chrome/common/ntp_tile", "//ios/chrome/common/ntp_tile",
"//ios/chrome/common/ui/elements",
"//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/favicon",
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
] ]
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "ios/chrome/common/highlight_button.h" #import "ios/chrome/common/ui/elements/highlight_button.h"
@class FaviconView; @class FaviconView;
......
...@@ -61,9 +61,9 @@ source_set("search_widget") { ...@@ -61,9 +61,9 @@ source_set("search_widget") {
deps = [ deps = [
"//base", "//base",
"//components/open_from_clipboard:open_from_clipboard_impl", "//components/open_from_clipboard:open_from_clipboard_impl",
"//ios/chrome/common:common_extension",
"//ios/chrome/common/app_group", "//ios/chrome/common/app_group",
"//ios/chrome/common/app_group:command", "//ios/chrome/common/app_group:command",
"//ios/chrome/common/ui/elements",
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
] ]
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "ios/chrome/common/highlight_button.h" #import "ios/chrome/common/ui/elements/highlight_button.h"
typedef NS_ENUM(NSInteger, CopiedContentType) { typedef NS_ENUM(NSInteger, CopiedContentType) {
CopiedContentTypeNone, CopiedContentTypeNone,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "ios/chrome/common/highlight_button.h" #import "ios/chrome/common/ui/elements/highlight_button.h"
// View for an action to launch the app from the widget. Represented as a // View for an action to launch the app from the widget. Represented as a
// circular icon and a label. When tapped it calls |actionSelector| in |target|. // circular icon and a label. When tapped it calls |actionSelector| in |target|.
......
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