| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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("//mojo/public/mojo_application_manifest.gni") | 5 import("//mojo/public/mojo_application_manifest.gni") | 
| 6 import("//mojo/public/tools/bindings/mojom.gni") | 6 import("//mojo/public/tools/bindings/mojom.gni") | 
| 7 import("//testing/test.gni") | 7 import("//testing/test.gni") | 
| 8 | 8 | 
| 9 group("all") { | 9 group("all") { | 
| 10   testonly = true | 10   testonly = true | 
| 11   deps = [ | 11   deps = [ | 
| 12     ":shell", | 12     ":shell", | 
| 13     "//mojo/shell/background", | 13     "//services/shell/background", | 
| 14     "//mojo/shell/runner", | 14     "//services/shell/runner", | 
| 15     "//mojo/shell/standalone", | 15     "//services/shell/standalone", | 
| 16     "//mojo/shell/tests", | 16     "//services/shell/tests", | 
| 17   ] | 17   ] | 
| 18 } | 18 } | 
| 19 | 19 | 
| 20 source_set("shell") { | 20 source_set("shell") { | 
| 21   output_name = "mojo_shell" | 21   output_name = "mojo_shell" | 
| 22   sources = [ | 22   sources = [ | 
| 23     "connect_params.cc", | 23     "connect_params.cc", | 
| 24     "connect_params.h", | 24     "connect_params.h", | 
| 25     "connect_util.cc", | 25     "connect_util.cc", | 
| 26     "connect_util.h", | 26     "connect_util.h", | 
| 27     "loader.h", | 27     "loader.h", | 
| 28     "native_runner.h", | 28     "native_runner.h", | 
| 29     "native_runner_delegate.h", | 29     "native_runner_delegate.h", | 
| 30     "shell.cc", | 30     "shell.cc", | 
| 31     "shell.h", | 31     "shell.h", | 
| 32     "switches.cc", | 32     "switches.cc", | 
| 33     "switches.h", | 33     "switches.h", | 
| 34   ] | 34   ] | 
| 35 | 35 | 
| 36   deps = [ | 36   deps = [ | 
| 37     "//base", | 37     "//base", | 
| 38     "//base/third_party/dynamic_annotations", | 38     "//base/third_party/dynamic_annotations", | 
| 39     "//mojo/common", | 39     "//mojo/common", | 
| 40     "//mojo/public/cpp/bindings", | 40     "//mojo/public/cpp/bindings", | 
| 41     "//mojo/services/catalog/public/interfaces", | 41     "//mojo/services/catalog/public/interfaces", | 
| 42     "//mojo/shell/public/cpp:sources", |  | 
| 43     "//mojo/shell/public/interfaces", |  | 
| 44     "//mojo/util:filename_util", | 42     "//mojo/util:filename_util", | 
|  | 43     "//services/shell/public/cpp:sources", | 
|  | 44     "//services/shell/public/interfaces", | 
| 45     "//url", | 45     "//url", | 
| 46   ] | 46   ] | 
| 47 | 47 | 
| 48   public_deps = [ | 48   public_deps = [ | 
| 49     # ApplicationManager exposes and uses PackageManager types in its header. | 49     # ApplicationManager exposes and uses PackageManager types in its header. | 
| 50     "//mojo/services/catalog:lib", | 50     "//mojo/services/catalog:lib", | 
| 51   ] | 51   ] | 
| 52 | 52 | 
| 53   data_deps = [ | 53   data_deps = [ | 
| 54     ":manifest", | 54     ":manifest", | 
| 55   ] | 55   ] | 
| 56 | 56 | 
| 57   # For mojo/shell/application_loader.h | 57   # For services/shell/loader.h | 
| 58   allow_circular_includes_from = [ "//mojo/services/catalog:lib" ] | 58   allow_circular_includes_from = [ "//mojo/services/catalog:lib" ] | 
| 59 } | 59 } | 
| 60 | 60 | 
| 61 mojo_application_manifest("manifest") { | 61 mojo_application_manifest("manifest") { | 
| 62   application_name = "shell" | 62   application_name = "shell" | 
| 63   source = "manifest.json" | 63   source = "manifest.json" | 
| 64 } | 64 } | 
| OLD | NEW | 
|---|