Skip to content

Commit

Permalink
Revert of [Blimp] Adds a headless content shell as a blimp engine. It…
Browse files Browse the repository at this point in the history
… uses a dummy screen, and is a slimming … (patchset chromium#11 id:200001 of https://codereview.chromium.org/1364463003/ )

Reason for revert:
broke build:

http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20Clobber/builds/6346

Original issue's description:
> [Blimp] Adds a headless content shell as a blimp engine. It uses a dummy screen, and is a slimming down version of the content shell.
> It loads google.com as the initial URL.
>
> BUG=533592
>
> Committed: https://crrev.com/ce6219fba3471bb7b4d295127eb34e734d14f499
> Cr-Commit-Position: refs/heads/master@{#352902}

TBR=wez@chromium.org,dtrainor@chromium.org,davidben@chromium.org,sky@chromium.org,mark@chromium.org,haibinlu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=533592

Review URL: https://codereview.chromium.org/1397613002

Cr-Commit-Position: refs/heads/master@{#352949}
  • Loading branch information
kuan8 authored and Commit bot committed Oct 7, 2015
1 parent bdf351e commit b4738da
Show file tree
Hide file tree
Showing 31 changed files with 9 additions and 1,698 deletions.
3 changes: 3 additions & 0 deletions blimp/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# found in the LICENSE file.

group("blimp") {
# TODO(maniscalco): Remove the testonly attribute once blimp_engine no longer
# depends on content_shell (crbug.com/538353).
testonly = true
deps = [
"//blimp/client:blimp_client",
"//blimp/common:blimp_common",
Expand Down
61 changes: 6 additions & 55 deletions blimp/engine/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,16 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//build/config/features.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
import("//tools/grit/repack.gni")
import("//tools/grit/grit_rule.gni")

repack("pak") {
sources = [
"$root_gen_dir/blink/public/resources/blink_image_resources_100_percent.pak",
"$root_gen_dir/blink/public/resources/blink_resources.pak",
"$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
"$root_gen_dir/content/app/strings/content_strings_en-US.pak",
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
"$root_gen_dir/content/content_resources.pak",
"$root_gen_dir/net/net_resources.pak",
"$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",
]

deps = [
"//content:resources",
"//content/app/resources",
"//content/app/strings",
"//content/browser/tracing:resources",
"//net:net_resources",
"//third_party/WebKit/public:image_resources",
"//third_party/WebKit/public:resources",
"//ui/resources",
"//ui/strings",
]

if (toolkit_views) {
deps += [ "//ui/views/resources" ]
sources +=
[ "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak" ]
}

output = "$root_out_dir/blimp_engine.pak"
}

if (is_linux) {
executable("blimp_engine_app") {
sources = [
"app/blimp_main.cc",
]

deps = [
":pak",
"//blimp/engine/app",
]
}

# A stand-in for the Blimp Engine so we can get the Docker packaging working.
#
# TODO(maniscalco): Update to use the real engine once it's ready and remove
# the testonly attribute (crbug.com/538353).
group("blimp_engine") {
testonly = true
data_deps = [
":blimp_engine_app",
":pak",
"//content/shell:content_shell",
"//content/shell:pak",
]
}
}
10 changes: 0 additions & 10 deletions blimp/engine/DEPS

This file was deleted.

19 changes: 0 additions & 19 deletions blimp/engine/app/BUILD.gn

This file was deleted.

53 changes: 0 additions & 53 deletions blimp/engine/app/blimp_content_main_delegate.cc

This file was deleted.

43 changes: 0 additions & 43 deletions blimp/engine/app/blimp_content_main_delegate.h

This file was deleted.

14 changes: 0 additions & 14 deletions blimp/engine/app/blimp_main.cc

This file was deleted.

34 changes: 0 additions & 34 deletions blimp/engine/browser/BUILD.gn

This file was deleted.

Loading

0 comments on commit b4738da

Please sign in to comment.