diff options
| author | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 20:04:45 +0000 |
|---|---|---|
| committer | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 20:04:45 +0000 |
| commit | 2b57079cc07e2c47af02ca8577adc648f90ea14f (patch) | |
| tree | 606f1596fde2ea3e0f7b9cde189f9d60e9af5114 /remoting/remoting.gyp | |
| parent | 39b58adfb5feac4584465466fc34cff25cc8dd02 (diff) | |
| download | chromium_src-2b57079cc07e2c47af02ca8577adc648f90ea14f.zip chromium_src-2b57079cc07e2c47af02ca8577adc648f90ea14f.tar.gz chromium_src-2b57079cc07e2c47af02ca8577adc648f90ea14f.tar.bz2 | |
Move non-manifest stuff out of appsv2.patch.
This simplifies the task of adding new Apps V2 functionality and should reduce the need to update the patch when JS changes are made.
The change is mostly mechanical, with the exception of a couple of places where the code being patched was run before remoting.init, which is where I've put the isAppsV2 initialization. Since order of execution of code defined at top-level in Javascript is a tricky topic, I've removed most of it, leaving just a 'load' event listener, which is the recommended approach.
BUG=134213
R=lambroslambrou@chromium.org
Review URL: https://codereview.chromium.org/19522007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 121002d..6816b7e 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -165,6 +165,7 @@ 'webapp/host_settings.js', 'webapp/host_setup_dialog.js', 'webapp/host_table_entry.js', + 'webapp/identity.js', 'webapp/l10n.js', 'webapp/log_to_server.js', 'webapp/menu_button.js', @@ -2020,7 +2021,6 @@ ], 'remoting_webapp_apps_v2_js_files': [ 'webapp/background.js', - 'webapp/identity.js', ], }, 'dependencies': [ |