diff options
| author | wittman <wittman@chromium.org> | 2015-06-24 16:50:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-24 23:51:36 +0000 |
| commit | ff29a0c782bcba9f72d459b5126b1416d99809bb (patch) | |
| tree | c356c8244c5a869c1a7f183f79610df440b5dfb6 /remoting/resources | |
| parent | 4a5a83b5e7452f8c071abc761724888848929a40 (diff) | |
| download | chromium_src-ff29a0c782bcba9f72d459b5126b1416d99809bb.zip chromium_src-ff29a0c782bcba9f72d459b5126b1416d99809bb.tar.gz chromium_src-ff29a0c782bcba9f72d459b5126b1416d99809bb.tar.bz2 | |
Revert of Chromoting Android: Add Credits screen. (patchset #2 id:20001 of https://codereview.chromium.org/1202523007/)
Reason for revert:
Appears to break gclient runhooks:
Error: Command '/usr/bin/python src/build/gyp_chromium' returned non-zero exit status 1 in /b/build/slave/Android/build
Updating projects from gyp files...
Traceback (most recent call last):
File "src/build/gyp_chromium", line 323, in <module>
gyp_rc = gyp.main(args)
File "/b/build/slave/Android/build/src/tools/gyp/pylib/gyp/__init__.py", line 538, in main
return gyp_main(args)
File "/b/build/slave/Android/build/src/tools/gyp/pylib/gyp/__init__.py", line 514, in gyp_main
options.duplicate_basename_check)
File "/b/build/slave/Android/build/src/tools/gyp/pylib/gyp/__init__.py", line 130, in Load
params['parallel'], params['root_targets'])
File "/b/build/slave/Android/build/src/tools/gyp/pylib/gyp/input.py", line 2785, in Load
RemoveLinkDependenciesFromNoneTargets(targets)
File "/b/build/slave/Android/build/src/tools/gyp/pylib/gyp/input.py", line 1501, in RemoveLinkDependenciesFromNoneTargets
if targets[t].get('variables', {}).get('link_dependency', 0):
KeyError: '/b/build/slave/Android/build/src/remoting/remoting.gyp:remoting_credits#target'
Hook '/usr/bin/python src/build/gyp_chromium' took 12.40 secs
Original issue's description:
> Chromoting Android: Add Credits screen.
>
> This also slightly changes the behavior of the embedded WebView. Now it
> only renders content inline if it originates from the initial host that
> it was told to use (otherwise it launches an external browser). This
> simplifies the code (by using a single explicitly-defined
> WebViewClient implementation).
>
> BUG=499478
>
> Committed: https://crrev.com/6dd51554c5c0c8378096aa47b04baf5b5c004560
> Cr-Commit-Position: refs/heads/master@{#336030}
TBR=jamiewalch@chromium.org,lambroslambrou@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=499478
Review URL: https://codereview.chromium.org/1206723005
Cr-Commit-Position: refs/heads/master@{#336037}
Diffstat (limited to 'remoting/resources')
| -rw-r--r-- | remoting/resources/remoting_strings.grd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd index 1ef230f..926710c 100644 --- a/remoting/resources/remoting_strings.grd +++ b/remoting/resources/remoting_strings.grd @@ -785,7 +785,7 @@ For information about privacy, please see the Google Privacy Policy (http://goo. <message desc="Help link, displayed in the top-left (assuming ltr layout) corner of the main screen. Clicking this takes the user to our FAQ." name="IDS_HELP"> Help </message> - <message desc="Credits link, displayed in the top-left (assuming ltr layout) corner of the main screen. Clicking this takes the user to our acknowledgements screen." name="IDS_CREDITS" formatter_data="android_java"> + <message desc="Credits link, displayed in the top-left (assuming ltr layout) corner of the main screen. Clicking this takes the user to our acknowledgements screen." name="IDS_CREDITS"> Credits </message> <message desc="Clicking this button starts the desktop access process." name="IDS_HOME_ACCESS_BUTTON"> |