Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: ios/chrome/browser/ui/bookmarks/BUILD.gn

Issue 2737603007: [ObjC ARC] Converts ios/chrome/browser/ui/bookmarks:bookmarks_arc_2 to ARC. (Closed)
Patch Set: fixed compile Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ios/chrome/browser/ui/bookmarks/bookmark_collection_cells.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/bookmarks/BUILD.gn
diff --git a/ios/chrome/browser/ui/bookmarks/BUILD.gn b/ios/chrome/browser/ui/bookmarks/BUILD.gn
index bbe8c4ec94339b3798daa4c686d5df55945fb5fb..cca0d86f5b58213b42e8c2ad42c7322d487bf2b8 100644
--- a/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -2,6 +2,91 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+source_set("bookmarks_arc_2") {
lpromero 2017/03/10 12:08:44 I didn't get why the sources files are not just ad
stkhapugin 2017/03/10 14:22:40 Yes, sorry, I forgot to merge this. Done.
+ configs += [ "//build/config/compiler:enable_arc" ]
+ sources = [
+ "bookmark_collection_cells.h",
+ "bookmark_collection_cells.mm",
+ "bookmark_collection_view.h",
+ "bookmark_collection_view.mm",
+ "bookmark_collection_view_background.h",
+ "bookmark_collection_view_background.mm",
+ "bookmark_controller_factory.h",
+ "bookmark_controller_factory.mm",
+ "bookmark_edit_view_controller.h",
+ "bookmark_edit_view_controller.mm",
+ "bookmark_elevated_toolbar.h",
+ "bookmark_elevated_toolbar.mm",
+ "bookmark_extended_button.h",
+ "bookmark_extended_button.mm",
+ "bookmark_folder_collection_view.h",
+ "bookmark_folder_collection_view.mm",
+ "bookmark_folder_editor_view_controller.h",
+ "bookmark_folder_editor_view_controller.mm",
+ "bookmark_folder_table_view_cell.h",
+ "bookmark_folder_table_view_cell.mm",
+ "bookmark_folder_view_controller.h",
+ "bookmark_folder_view_controller.mm",
+ ]
+ deps = [
+ ":resources",
+ "//base",
+ "//base:i18n",
+ "//components/bookmarks/browser",
+ "//components/favicon/core",
+ "//components/favicon_base",
+ "//components/pref_registry",
+ "//components/prefs",
+ "//components/query_parser",
+ "//components/signin/core/browser",
+ "//components/strings",
+ "//components/undo",
+ "//components/url_formatter",
+ "//google_apis",
+ "//ios/chrome/app/strings",
+ "//ios/chrome/app/theme",
+ "//ios/chrome/browser",
+ "//ios/chrome/browser/bookmarks",
+ "//ios/chrome/browser/bookmarks:bookmarks_utils",
+ "//ios/chrome/browser/browser_state",
+ "//ios/chrome/browser/favicon",
+ "//ios/chrome/browser/metrics:metrics_internal",
+ "//ios/chrome/browser/signin",
+ "//ios/chrome/browser/tabs",
+ "//ios/chrome/browser/ui",
+ "//ios/chrome/browser/ui/alert_coordinator",
+ "//ios/chrome/browser/ui/bookmarks/bars",
+ "//ios/chrome/browser/ui/bookmarks/cells",
+ "//ios/chrome/browser/ui/collection_view",
+ "//ios/chrome/browser/ui/collection_view/cells",
+ "//ios/chrome/browser/ui/colors",
+ "//ios/chrome/browser/ui/commands",
+ "//ios/chrome/browser/ui/icons",
+ "//ios/chrome/browser/ui/keyboard",
+ "//ios/chrome/browser/ui/material_components",
+ "//ios/chrome/browser/ui/ntp",
+ "//ios/chrome/browser/undo",
+ "//ios/public/provider/chrome/browser",
+ "//ios/public/provider/chrome/browser/ui",
+ "//ios/third_party/material_components_ios",
+ "//ios/third_party/material_roboto_font_loader_ios",
+ "//ios/web",
+ "//skia",
+ "//ui/base",
+ "//ui/gfx",
+ "//url",
+ ]
+ allow_circular_includes_from = [
+ "//ios/chrome/browser/ui/bookmarks/bars",
+ "//ios/chrome/browser/ui/bookmarks/cells",
+ ]
+ libs = [
+ "CoreGraphics.framework",
+ "QuartzCore.framework",
+ "UIKit.framework",
+ ]
+}
+
source_set("bookmarks_arc") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
@@ -60,9 +145,13 @@ source_set("bookmarks_arc") {
"//ui/gfx",
"//url",
]
+ public_deps = [
+ ":bookmarks_arc_2",
+ ]
allow_circular_includes_from = [
"//ios/chrome/browser/ui/bookmarks/bars",
"//ios/chrome/browser/ui/bookmarks/cells",
+ ":bookmarks_arc_2",
]
libs = [
"CoreGraphics.framework",
@@ -73,28 +162,6 @@ source_set("bookmarks_arc") {
source_set("bookmarks") {
sources = [
- "bookmark_collection_cells.h",
- "bookmark_collection_cells.mm",
- "bookmark_collection_view.h",
- "bookmark_collection_view.mm",
- "bookmark_collection_view_background.h",
- "bookmark_collection_view_background.mm",
- "bookmark_controller_factory.h",
- "bookmark_controller_factory.mm",
- "bookmark_edit_view_controller.h",
- "bookmark_edit_view_controller.mm",
- "bookmark_elevated_toolbar.h",
- "bookmark_elevated_toolbar.mm",
- "bookmark_extended_button.h",
- "bookmark_extended_button.mm",
- "bookmark_folder_collection_view.h",
- "bookmark_folder_collection_view.mm",
- "bookmark_folder_editor_view_controller.h",
- "bookmark_folder_editor_view_controller.mm",
- "bookmark_folder_table_view_cell.h",
- "bookmark_folder_table_view_cell.mm",
- "bookmark_folder_view_controller.h",
- "bookmark_folder_view_controller.mm",
"bookmark_home_primary_view.h",
"bookmark_home_view_controller.h",
"bookmark_home_view_controller.mm",
@@ -175,11 +242,13 @@ source_set("bookmarks") {
]
public_deps = [
":bookmarks_arc",
+ ":bookmarks_arc_2",
]
allow_circular_includes_from = [
"//ios/chrome/browser/ui/bookmarks/bars",
"//ios/chrome/browser/ui/bookmarks/cells",
":bookmarks_arc",
+ ":bookmarks_arc_2",
]
libs = [
"CoreGraphics.framework",
« no previous file with comments | « no previous file | ios/chrome/browser/ui/bookmarks/bookmark_collection_cells.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698