Permalink
Browse files

Bug 1160915 - merge pull request #30047 from KevinGrandon:bug_1160915…

…_default_combined_chrome to mozilla-b2g:master
  • Loading branch information...
mozilla-autolander-deprecated committed May 14, 2015
2 parents fae98d0 + f76b42b commit c5b3aa4fc662d961eba79ef24d1378a243109e29
Showing with 12 additions and 1 deletion.
  1. +1 −1 apps/system/js/app_chrome.js
  2. +11 −0 apps/system/test/unit/app_chrome_test.js
@@ -617,7 +617,7 @@
};
AppChrome.prototype.useCombinedChrome = function ac_useCombinedChrome(evt) {
return this.app.config.chrome && !this.app.config.chrome.bar;
return !this.app.config.chrome || !this.app.config.chrome.bar;
};
AppChrome.prototype._updateLocation =
@@ -53,6 +53,11 @@ suite('system/AppChrome', function() {
stubById.restore();
});
var fakeActivityConfig = {
url: 'http://google.com/index.html',
origin: 'app://google.com'
};
var fakeWebSite = {
url: 'http://google.com/index.html',
origin: 'app://google.com',
@@ -164,6 +169,12 @@ suite('system/AppChrome', function() {
assert.isTrue(stubHandleSecurityChanged.called);
assert.equal(chrome.sslIndicator.dataset.ssl, 'broken');
});
test('Activities should use combined chrome', function() {
var app = new AppWindow(fakeActivityConfig);
var chrome = new AppChrome(app);
assert.isTrue(chrome.useCombinedChrome());
});
});
suite('Views', function() {

0 comments on commit c5b3aa4

Please sign in to comment.