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

Side by Side Diff: components/url_formatter/BUILD.gn

Issue 1428593004: Enable url_formatter::ElideUrl and url_formatter::ElideHost for aura Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change gfx::ElideText too Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | components/url_formatter/elide_url.h » ('j') | ui/gfx/text_elider.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 import("//build/config/ui.gni")
msw 2015/11/03 23:55:33 nit: add a blank line above.
bshe 2015/11/04 14:38:00 Done.
4 5
5 source_set("url_formatter") { 6 source_set("url_formatter") {
6 sources = [ 7 sources = [
7 "elide_url.cc", 8 "elide_url.cc",
8 "elide_url.h", 9 "elide_url.h",
9 "url_fixer.cc", 10 "url_fixer.cc",
10 "url_fixer.h", 11 "url_fixer.h",
11 "url_formatter.cc", 12 "url_formatter.cc",
12 "url_formatter.h", 13 "url_formatter.h",
13 ] 14 ]
14 15
15 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 16 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
16 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 17 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
17 18
18 deps = [ 19 deps = [
19 "//base", 20 "//base",
20 "//third_party/icu", 21 "//third_party/icu",
21 "//net", 22 "//net",
23 "//ui/gfx",
22 "//url", 24 "//url",
23 ] 25 ]
24 26
25 if (!is_android) { 27 if (is_android && !use_aura) {
msw 2015/11/03 23:55:33 Consider: if (!is_android || use_aura) { deps += [
bshe 2015/11/04 14:38:01 Done.
26 deps += [ "//ui/gfx" ] 28 deps -= [ "//ui/gfx" ]
msw 2015/11/03 23:55:33 Shouldn't the GYP file have corresponding changes?
bshe 2015/11/04 14:38:00 For aura Android, we will only support gn build. T
msw 2015/11/04 19:16:11 Hmm, it's a gray area, I's update GYP too, but it
bshe 2015/11/04 22:38:21 Right. Updated GYP file since it is pretty trivial
27 } 29 }
28 } 30 }
29 31
30 source_set("unit_tests") { 32 source_set("unit_tests") {
31 testonly = true 33 testonly = true
32 sources = [ 34 sources = [
33 "elide_url_unittest.cc", 35 "elide_url_unittest.cc",
34 "url_fixer_unittest.cc", 36 "url_fixer_unittest.cc",
35 "url_formatter_unittest.cc", 37 "url_formatter_unittest.cc",
36 ] 38 ]
37 39
38 deps = [ 40 deps = [
39 ":url_formatter", 41 ":url_formatter",
40 "//base", 42 "//base",
41 "//net", 43 "//net",
42 "//testing/gtest", 44 "//testing/gtest",
43 "//ui/gfx", 45 "//ui/gfx",
44 "//url", 46 "//url",
45 ] 47 ]
46 48
47 if (is_android) { 49 if (is_android && !use_aura) {
48 deps -= [ "//ui/gfx" ] 50 deps -= [ "//ui/gfx" ]
49 } 51 }
50 } 52 }
OLDNEW
« no previous file with comments | « no previous file | components/url_formatter/elide_url.h » ('j') | ui/gfx/text_elider.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698