Merge pull request #23281 from benfrancis/1056884

Bug 1056884 - Implement special expanded Rocketbar state for browser start page r=kgrandon

apps/system/js/app_chrome.js

@@ -54,6 +54,7 @@
 
     if (this.isSearchApp()) {
       this.app.element.classList.add('search-app');
+      this.title.textContent = _('search-or-enter-address');
     }
 
     if (chrome.bar) {
@@ -370,6 +371,9 @@
     };
 
   AppChrome.prototype.setFreshTitle = function ac_setFreshTitle(title) {
+    if (this.isSearchApp()) {
+      return;
+    }
     this.title.textContent = title;
     clearTimeout(this._titleTimeout);
     this._recentTitle = true;

apps/system/style/chrome/chrome.css

@@ -113,6 +113,20 @@
   background-color: rgba(51,51,51,0.5);
   border-radius: 1.8rem;
   text-overflow: ellipsis;
+  font-style: italic;
+}
+
+.search-app .chrome.maximized .controls .urlbar:after {
+  content: '';
+  width: 2rem;
+  height: 100%;
+  top: 0;
+  right: 0.8rem;
+  position: absolute;
+  background-image: url('images/dark/search.png');
+  background-repeat: no-repeat;
+  background-size: 2rem auto;
+  background-position: center right;
 }
 
 .appWindow.light .chrome:not(.maximized) .controls .urlbar .title {

apps/system/test/unit/app_chrome_test.js

@@ -60,6 +60,20 @@ suite('system/AppChrome', function() {
     }
   };
 
+  var fakeSearchApp = {
+    url: 'app://search.gaiamobile.org/newtab.html',
+    name: 'Browser',
+    manifest: {
+      name: 'Browser',
+      role: 'search',
+    },
+    manifestURL: 'app://search.gaiamobile.org/manifest.webapp',
+    origin: 'app://search.gaiamobile.org',
+    chrome: {
+        navigation: true
+    }
+  };
+
   var fakeAppConfigBar = {
     url: 'app://www.fake/index.html',
     chrome: {
@@ -320,7 +334,18 @@ suite('system/AppChrome', function() {
       this.sinon.clock.tick(500);
       assert.equal(subject.title.textContent, 'Bing');
     });
-
+
+    test('browser start page should always have the same title',
+    function() {
+      var app = new AppWindow(fakeSearchApp);
+      var chrome = new AppChrome(app);
+      var titleEvent = new CustomEvent('mozbrowsertitlechange', {
+        detail: 'Bing'
+      });
+      chrome.app.element.dispatchEvent(titleEvent);
+      assert.equal(chrome.title.textContent, 'search-or-enter-address');
+    });
+
     test('should expand if collapsed', function() {
       var stubIsBrowser = sinon.stub(subject.app, 'isBrowser', function() {
         return true;