Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 | 4 |
| 5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//mojo/public/tools/bindings/mojom.gni") | 8 import("//mojo/public/tools/bindings/mojom.gni") |
| 9 import("//tools/grit/repack.gni") | 9 import("//tools/grit/repack.gni") |
| 10 import("//tools/grit/grit_rule.gni") | 10 import("//tools/grit/grit_rule.gni") |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 53 "app/blimp_content_browser_client.h", | 53 "app/blimp_content_browser_client.h", |
| 54 "app/blimp_content_main_delegate.cc", | 54 "app/blimp_content_main_delegate.cc", |
| 55 "app/blimp_content_main_delegate.h", | 55 "app/blimp_content_main_delegate.h", |
| 56 ] | 56 ] |
| 57 | 57 |
| 58 deps = [ | 58 deps = [ |
| 59 ":app_config", | 59 ":app_config", |
| 60 ":app_net", | 60 ":app_net", |
| 61 ":app_permissions", | 61 ":app_permissions", |
| 62 ":app_settings", | 62 ":app_settings", |
| 63 ":app_switches", | |
| 64 ":app_ui", | 63 ":app_ui", |
| 65 ":blob_channel", | 64 ":blob_channel", |
| 66 ":common", | 65 ":common", |
| 67 ":crash", | 66 ":crash", |
| 68 ":renderer", | 67 ":renderer", |
| 69 ":session", | 68 ":session", |
| 70 "//base", | 69 "//base", |
| 71 "//blimp/common", | 70 "//blimp/common", |
| 71 "//blimp/common:app_switches", | |
|
Kevin M
2016/05/11 00:39:57
Remove "app_switches" and just use "common" top-le
CJ
2016/05/11 23:48:49
Done.
| |
| 72 "//blimp/common/proto", | 72 "//blimp/common/proto", |
| 73 "//blimp/engine:blob_channel_mojo_cpp_sources", | 73 "//blimp/engine:blob_channel_mojo_cpp_sources", |
| 74 "//blimp/net", | 74 "//blimp/net", |
| 75 "//components/crash/content/app:app_breakpad_mac_win_to_be_deleted", | 75 "//components/crash/content/app:app_breakpad_mac_win_to_be_deleted", |
| 76 "//components/crash/content/app:lib", | 76 "//components/crash/content/app:lib", |
| 77 "//content/public/app:both", | 77 "//content/public/app:both", |
| 78 "//content/public/browser", | 78 "//content/public/browser", |
| 79 "//content/public/common", | 79 "//content/public/common", |
| 80 "//content/public/renderer", | 80 "//content/public/renderer", |
| 81 "//content/public/utility", | 81 "//content/public/utility", |
| 82 "//net", | 82 "//net", |
| 83 ] | 83 ] |
| 84 } | 84 } |
| 85 | 85 |
| 86 source_set("app_config") { | 86 source_set("app_config") { |
| 87 sources = [ | 87 sources = [ |
| 88 "app/blimp_engine_config.cc", | 88 "app/blimp_engine_config.cc", |
| 89 "app/blimp_engine_config.h", | 89 "app/blimp_engine_config.h", |
| 90 ] | 90 ] |
| 91 deps = [ | 91 deps = [ |
| 92 ":app_switches", | |
| 93 "//base", | 92 "//base", |
| 93 "//blimp/common", | |
| 94 "//blimp/common:app_switches", | |
| 94 "//cc", | 95 "//cc", |
| 95 "//content/public/common", | 96 "//content/public/common", |
| 96 "//ui/gl", | 97 "//ui/gl", |
| 97 "//ui/native_theme", | 98 "//ui/native_theme", |
| 98 ] | 99 ] |
| 99 } | 100 } |
| 100 | 101 |
| 101 source_set("app_net") { | 102 source_set("app_net") { |
| 102 sources = [ | 103 sources = [ |
| 103 "app/blimp_network_delegate.cc", | 104 "app/blimp_network_delegate.cc", |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 132 "app/settings_manager.cc", | 133 "app/settings_manager.cc", |
| 133 "app/settings_manager.h", | 134 "app/settings_manager.h", |
| 134 ] | 135 ] |
| 135 deps = [ | 136 deps = [ |
| 136 "//blimp/net", | 137 "//blimp/net", |
| 137 "//content/public/browser", | 138 "//content/public/browser", |
| 138 "//content/public/common", | 139 "//content/public/common", |
| 139 ] | 140 ] |
| 140 } | 141 } |
| 141 | 142 |
| 142 source_set("app_switches") { | |
| 143 sources = [ | |
| 144 "app/switches.cc", | |
| 145 "app/switches.h", | |
| 146 ] | |
| 147 } | |
| 148 | |
| 149 source_set("app_ui") { | 143 source_set("app_ui") { |
| 150 sources = [ | 144 sources = [ |
| 151 "app/ui/blimp_layout_manager.cc", | 145 "app/ui/blimp_layout_manager.cc", |
| 152 "app/ui/blimp_layout_manager.h", | 146 "app/ui/blimp_layout_manager.h", |
| 153 "app/ui/blimp_screen.cc", | 147 "app/ui/blimp_screen.cc", |
| 154 "app/ui/blimp_screen.h", | 148 "app/ui/blimp_screen.h", |
| 155 "app/ui/blimp_window_tree_client.cc", | 149 "app/ui/blimp_window_tree_client.cc", |
| 156 "app/ui/blimp_window_tree_client.h", | 150 "app/ui/blimp_window_tree_client.h", |
| 157 "app/ui/blimp_window_tree_host.cc", | 151 "app/ui/blimp_window_tree_host.cc", |
| 158 "app/ui/blimp_window_tree_host.h", | 152 "app/ui/blimp_window_tree_host.h", |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 274 | 268 |
| 275 source_set("session") { | 269 source_set("session") { |
| 276 sources = [ | 270 sources = [ |
| 277 "session/blimp_engine_session.cc", | 271 "session/blimp_engine_session.cc", |
| 278 "session/blimp_engine_session.h", | 272 "session/blimp_engine_session.h", |
| 279 ] | 273 ] |
| 280 | 274 |
| 281 deps = [ | 275 deps = [ |
| 282 ":app_config", | 276 ":app_config", |
| 283 ":app_settings", | 277 ":app_settings", |
| 284 ":app_switches", | |
| 285 ":app_ui", | 278 ":app_ui", |
| 286 ":common", | 279 ":common", |
| 287 ":feature", | 280 ":feature", |
| 288 "//base", | 281 "//base", |
| 289 "//blimp/common", | 282 "//blimp/common", |
| 283 "//blimp/common:app_switches", | |
| 290 "//blimp/common/proto", | 284 "//blimp/common/proto", |
| 291 "//blimp/net", | 285 "//blimp/net", |
| 292 "//content/public/browser", | 286 "//content/public/browser", |
| 293 "//net", | 287 "//net", |
| 294 "//ui/aura", | 288 "//ui/aura", |
| 295 "//ui/base/ime", | 289 "//ui/base/ime", |
| 296 "//ui/gfx/geometry", | 290 "//ui/gfx/geometry", |
| 297 "//ui/wm", | 291 "//ui/wm", |
| 298 ] | 292 ] |
| 299 } | 293 } |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 335 sources = [ | 329 sources = [ |
| 336 "app/blimp_engine_config_unittest.cc", | 330 "app/blimp_engine_config_unittest.cc", |
| 337 "app/settings_manager_unittest.cc", | 331 "app/settings_manager_unittest.cc", |
| 338 "app/ui/blimp_screen_unittest.cc", | 332 "app/ui/blimp_screen_unittest.cc", |
| 339 ] | 333 ] |
| 340 | 334 |
| 341 deps = [ | 335 deps = [ |
| 342 ":app", | 336 ":app", |
| 343 ":app_config", | 337 ":app_config", |
| 344 ":app_settings", | 338 ":app_settings", |
| 345 ":app_switches", | |
| 346 "//base", | 339 "//base", |
| 347 "//base/test:run_all_unittests", | 340 "//base/test:run_all_unittests", |
| 348 "//base/test:test_support", | 341 "//base/test:test_support", |
| 342 "//blimp/common:app_switches", | |
| 343 "//blimp/common:test_support", | |
| 349 "//blimp/engine:app_ui", | 344 "//blimp/engine:app_ui", |
| 350 "//testing/gmock", | 345 "//testing/gmock", |
| 351 "//testing/gtest", | 346 "//testing/gtest", |
| 352 "//ui/display", | 347 "//ui/display", |
| 353 "//ui/gfx:test_support", | 348 "//ui/gfx:test_support", |
| 354 ] | 349 ] |
| 355 } | 350 } |
| 356 | 351 |
| 357 source_set("feature_unit_tests") { | 352 source_set("feature_unit_tests") { |
| 358 testonly = true | 353 testonly = true |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 462 _rebased_dockerfile, | 457 _rebased_dockerfile, |
| 463 "--startup-script", | 458 "--startup-script", |
| 464 _rebased_startup_script, | 459 _rebased_startup_script, |
| 465 "--manifest", | 460 "--manifest", |
| 466 _rebased_manifest, | 461 _rebased_manifest, |
| 467 "--output", | 462 "--output", |
| 468 rebase_path(_bundle), | 463 rebase_path(_bundle), |
| 469 ] | 464 ] |
| 470 } | 465 } |
| 471 } | 466 } |
| OLD | NEW |