diff options
| author | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 11:30:13 +0000 |
|---|---|---|
| committer | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 11:30:13 +0000 |
| commit | 610d878e8d6d36fe956fd9271127e57f58ff7fa7 (patch) | |
| tree | baf06020d1696e59c62ad057913b974884bf84f8 /remoting | |
| parent | c0c1597304a799d7ae5879b7dcda6c7788cc7768 (diff) | |
| download | chromium_src-610d878e8d6d36fe956fd9271127e57f58ff7fa7.zip chromium_src-610d878e8d6d36fe956fd9271127e57f58ff7fa7.tar.gz chromium_src-610d878e8d6d36fe956fd9271127e57f58ff7fa7.tar.bz2 | |
Fixed patch and updated script to be stricter.
The -F0 option tells patch not to apply fuzzing when trying to match. This will probably result in the patch getting broken more often, but now that the apps v2 version is built by default, that should be noticed and fixed by the person who breaks it, rather than someone much later on.
Review URL: https://chromiumcodereview.appspot.com/16391002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/webapp/appsv2.patch | 12 | ||||
| -rwxr-xr-x | remoting/webapp/build-webapp.py | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/remoting/webapp/appsv2.patch b/remoting/webapp/appsv2.patch index 0b9c8f3..d100383 100644 --- a/remoting/webapp/appsv2.patch +++ b/remoting/webapp/appsv2.patch @@ -21,14 +21,14 @@ diff --git a/remoting/webapp/host_controller.js b/remoting/webapp/host_controlle index 83c9844..98f63c3 100644 --- a/host_controller.js +++ b/host_controller.js -@@ -356,7 +356,7 @@ remoting.HostController.prototype.getLocalHostStateAndId = function(onDone) { - onDone(hostId); +@@ -31,7 +31,7 @@ remoting.HostController.prototype.getLocalHostStateAndId = function(onDone) { }; + try { - this.hostDispatcher_.getDaemonVersion(printVersion); + onConfig('{}'); } catch (err) { - onDone(null); + console.log('Host version not available.'); } diff --git a/remoting/webapp/main.html b/remoting/webapp/main.html index 061caeb..f61e532 100644 @@ -135,9 +135,9 @@ index f89072a..2fadd83 100644 remoting.stats = new remoting.ConnectionStats( document.getElementById('statistics')); remoting.formatIq = new remoting.FormatIq(); -@@ -133,9 +130,6 @@ remoting.initHomeScreenUi = function () { - document.getElementById('share-button').disabled = - !remoting.hostController.isPluginSupported(); +@@ -156,9 +151,6 @@ remoting.initHomeScreenUi = function () { + remoting.hostController = new remoting.HostController(); + document.getElementById('share-button').disabled = !isIT2MeSupported_(); remoting.setMode(remoting.AppMode.HOME); - if (!remoting.oauth2.isAuthenticated()) { - document.getElementById('auth-dialog').hidden = false; diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py index c55ea50..9e6fae0 100755 --- a/remoting/webapp/build-webapp.py +++ b/remoting/webapp/build-webapp.py @@ -177,7 +177,7 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin, for patch in patches: patchfile = os.path.join(os.getcwd(), patch) if subprocess.call(['patch', '-d', destination, '-i', patchfile, - '-p1']) != 0: + '-p1', '-F0']) != 0: print 'Patch ' + patch + ' failed to apply.' return 1 |