Commit 6d0b3151 authored by michaelpg's avatar michaelpg Committed by Commit bot

Create separate BUILD.gn for //apps/ui/views

This moves the views-related dependencies (including chrome/app/theme)
out of the top-level //apps static library.

Some DEPS includes were dropped entirely as they are no longer used in
//apps.

BUG=679971
R=benwells@chromium.org

Review-Url: https://codereview.chromium.org/2820563004
Cr-Commit-Position: refs/heads/master@{#469549}
parent 3580fd5b
......@@ -37,13 +37,12 @@ static_library("apps") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
deps = [
"//chrome/app/theme:theme_resources",
"//components/keyed_service/content",
"//content/public/browser",
"//content/public/common",
"//extensions/browser",
"//extensions/common",
"//extensions/common/api",
"//skia",
]
if (is_chromeos) {
......@@ -51,21 +50,6 @@ static_library("apps") {
}
}
if (toolkit_views) {
sources += [
"ui/views/app_window_frame_view.cc",
"ui/views/app_window_frame_view.h",
]
deps += [
"//cc/paint",
"//ui/strings",
"//ui/views",
]
if (enable_extensions) {
deps += [ "//extensions/browser" ]
}
}
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
}
......
include_rules = [
"+base",
"+cc/paint",
"+content/public/app",
"+content/public/browser",
"+content/public/common",
"+content/public/test",
"+components/keyed_service",
"+components/pref_registry/pref_registry_syncable.h",
"+components/sessions",
"+components/user_manager",
"+components/web_modal",
"+extensions",
"+net/base",
"+skia/ext",
"+third_party/skia/include",
"+ui",
"+win8",
# For default app icon.
"!chrome/grit/theme_resources.h",
]
specific_include_rules = {
# Needs to be able to reload extensions. http://crbug.com/162530
"app_load_service\.cc": [
"+chrome/browser/extensions/extension_service.h",
],
"(.*test\.cc|.*test_mac\.mm)": [
"+chrome/browser/browser_shutdown.h",
"+chrome/browser/extensions/extension_browsertest.h",
"+chrome/browser/extensions/extension_error_reporter.h",
"+chrome/browser/extensions/extension_test_message_listener.h",
"+chrome/browser/extensions/test_extension_environment.h",
"+chrome/browser/profiles/profile_manager.h",
"+chrome/browser/ui/browser.h",
"+chrome/browser/ui/simple_message_box_internal.h",
"+chrome/common/chrome_switches.h",
"+chrome/test/base/in_process_browser_test.h",
"+chrome/test/base/interactive_test_utils.h",
"+chrome/test/base/testing_profile.h",
# Temporary allowed testing include.
# TODO(benwells): Move app_browsertest_util into apps component once there
......
# 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.
import("//build/config/ui.gni")
import("//extensions/features/features.gni")
assert(enable_extensions)
source_set("views") {
sources = [
"app_window_frame_view.cc",
"app_window_frame_view.h",
]
deps = [
"//cc/paint",
"//chrome/app/theme:theme_resources",
"//extensions/browser/app_window",
"//extensions/common",
"//skia",
"//ui/gfx",
"//ui/strings",
"//ui/views",
]
}
......@@ -2,5 +2,12 @@ include_rules = [
# TODO(jamescook): Eliminate this by introducing apps_resources.grd, see
# crbug.com/306688
"+grit/theme_resources.h",
"+cc/paint",
"+extensions",
"+third_party/skia/include",
"+ui",
"+ui/strings/grit/ui_strings.h",
# For default app icon.
"!chrome/grit/theme_resources.h",
]
......@@ -1190,6 +1190,7 @@ split_static_library("ui") {
]
deps += [
"//apps",
"//apps/ui/views",
"//chrome/app/vector_icons",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/common:features",
......
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