Fixes for cr-settings-page-header

chrome/browser/resources/settings/settings_page/settings_page_header.js

Index: chrome/browser/resources/settings/settings_page/settings_page_header.js
diff --git a/chrome/browser/resources/settings/settings_page/settings_page_header.js b/chrome/browser/resources/settings/settings_page/settings_page_header.js
index fb02eba51c075332447b2e43fa260d114ae05f4f..7a151a8a980a67b5722127d70468f2c94d2ffa34 100644
--- a/chrome/browser/resources/settings/settings_page/settings_page_header.js
+++ b/chrome/browser/resources/settings/settings_page/settings_page_header.js
@@ -70,6 +70,8 @@ Polymer({
    * @private
    */
   getTopPageIcon_: function(pageStack) {
+    if (pageStack.length == 0)
+      return '';
     return pageStack[0].icon;
   },
 
@@ -88,17 +90,21 @@ Polymer({
    * @private
    */
   getCurrentPageTitle_: function(pageStack) {
+    if (pageStack.length == 0)
+      return '';
     return pageStack[0].pageTitle;
   },
 
   /** @private */
   selectedPageChanged_: function() {
-    if (this.selectedPage.subpage) {
+    if (this.selectedPage && this.selectedPage.subpage) {
       // NOTE: Must reassign pageStack rather than doing push() so that the
       // computed property (parentPages) will be notified of the update.
       this.pageStack = this.pageStack.concat(this.selectedPage);
-    } else {
+    } else if (this.selectedPage) {
       this.pageStack = [this.selectedPage];
+    } else {
+      this.pageStack = [];
     }
   },