Skip to content

Commit ae0d7ac

Browse files
edx246Commit Bot
authored and
Commit Bot
committed
[ios] Move TopAlignedImageView to c/b/ui/elements
TopAlignedImageView was previously only used in TabGrid. It will now also be used when adding a black/white placeholder when a tab is evicted. This CL moves the files so that it can be imported by another directory in the future. Change-Id: Idb7692f95192befafc2d0cdb0966df800a10fddc Reviewed-on: https://chromium-review.googlesource.com/c/1448520 Reviewed-by: edchin <[email protected]> Reviewed-by: Mark Cogan <[email protected]> Commit-Queue: edchin <[email protected]> Cr-Commit-Position: refs/heads/master@{#628353}
1 parent c95e3ab commit ae0d7ac

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

ios/chrome/browser/ui/elements/BUILD.gn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ source_set("elements") {
1212
"selector_picker_view_controller.h",
1313
"selector_picker_view_controller.mm",
1414
"selector_view_controller_delegate.h",
15+
"top_aligned_image_view.h",
16+
"top_aligned_image_view.mm",
1517
]
1618
deps = [
1719
"//base",

ios/chrome/browser/ui/tab_grid/grid/top_aligned_image_view.h renamed to ios/chrome/browser/ui/elements/top_aligned_image_view.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef IOS_CHROME_BROWSER_UI_TAB_GRID_GRID_TOP_ALIGNED_IMAGE_VIEW_H_
6-
#define IOS_CHROME_BROWSER_UI_TAB_GRID_GRID_TOP_ALIGNED_IMAGE_VIEW_H_
5+
#ifndef IOS_CHROME_BROWSER_UI_ELEMENTS_TOP_ALIGNED_IMAGE_VIEW_H_
6+
#define IOS_CHROME_BROWSER_UI_ELEMENTS_TOP_ALIGNED_IMAGE_VIEW_H_
77

88
#import <UIKit/UIKit.h>
99

@@ -19,4 +19,4 @@
1919
- (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE;
2020
@end
2121

22-
#endif // IOS_CHROME_BROWSER_UI_TAB_GRID_GRID_TOP_ALIGNED_IMAGE_VIEW_H_
22+
#endif // IOS_CHROME_BROWSER_UI_ELEMENTS_TOP_ALIGNED_IMAGE_VIEW_H_

ios/chrome/browser/ui/tab_grid/grid/top_aligned_image_view.mm renamed to ios/chrome/browser/ui/elements/top_aligned_image_view.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#import "ios/chrome/browser/ui/tab_grid/grid/top_aligned_image_view.h"
5+
#import "ios/chrome/browser/ui/elements/top_aligned_image_view.h"
66

77
#if !defined(__has_feature) || !__has_feature(objc_arc)
88
#error "This file requires ARC support."

ios/chrome/browser/ui/tab_grid/grid/BUILD.gn

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ source_set("grid_ui") {
2121
"grid_theme.h",
2222
"grid_view_controller.h",
2323
"grid_view_controller.mm",
24-
"top_aligned_image_view.h",
25-
"top_aligned_image_view.mm",
2624
]
2725

2826
configs += [ "//build/config/compiler:enable_arc" ]
@@ -32,6 +30,7 @@ source_set("grid_ui") {
3230
"//base",
3331
"//ios/chrome/app/strings",
3432
"//ios/chrome/browser",
33+
"//ios/chrome/browser/ui/elements",
3534
"//ios/chrome/browser/ui/tab_grid/transitions",
3635
"//ios/chrome/browser/ui/util",
3736
"//ios/chrome/common/ui_util",

ios/chrome/browser/ui/tab_grid/grid/grid_cell.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#import "ios/chrome/browser/ui/tab_grid/grid/grid_cell.h"
66

77
#include "base/logging.h"
8+
#import "ios/chrome/browser/ui/elements/top_aligned_image_view.h"
89
#import "ios/chrome/browser/ui/tab_grid/grid/grid_constants.h"
9-
#import "ios/chrome/browser/ui/tab_grid/grid/top_aligned_image_view.h"
1010
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
1111
#include "ios/chrome/grit/ios_strings.h"
1212
#include "ui/base/l10n/l10n_util.h"

ios/showcase/tab_grid/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ source_set("tab_grid") {
1717
]
1818
deps = [
1919
"//base",
20+
"//ios/chrome/browser/ui/elements",
2021
"//ios/chrome/browser/ui/tab_grid:tab_grid_ui",
2122
"//ios/chrome/browser/ui/tab_grid/grid:grid_ui",
2223
"//ios/showcase/common",

ios/showcase/tab_grid/sc_image_view_controller.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#import "ios/showcase/tab_grid/sc_image_view_controller.h"
66

7-
#import "ios/chrome/browser/ui/tab_grid/grid/top_aligned_image_view.h"
7+
#import "ios/chrome/browser/ui/elements/top_aligned_image_view.h"
88

99
#if !defined(__has_feature) || !__has_feature(objc_arc)
1010
#error "This file requires ARC support."

0 commit comments

Comments
 (0)