Extension Doc Changes (no building or testable changes)

chrome/common/extensions/docs/js/api_page_generator.js

 /**
  * @fileoverview This file is the controller for generating extension
  * doc pages.
  *
  * It expects to have available via XHR (relative path):
  *   1) API_TEMPLATE which is the main template for the api pages.
  *   2) A file located at SCHEMA which is shared with the extension system and
  *      defines the methods and events contained in one api.
  *   3) (Possibly) A static version of the current page url in /static/. I.e.
  *      if called as ../foo.html, it will look for ../static/foo.html.
@@ skipping 20 matching lines @@
 
 // The current module for this page (if this page is an api module);
 var module;
 
 // Mapping from typeId to module.
 var typeModule = {};
 
 // Auto-created page name as default
 var pageName;
 
-// If this page is an apiModule, the title of the api module
-var apiModuleTitle;
+// If this page is an apiModule, the name of the api module
+var apiModuleName;
 
 Array.prototype.each = function(f) {
   for (var i = 0; i < this.length; i++) {
     f(this[i], i);
   }
 }
 
 // Visits each item in the list in-order. Stops when f returns any truthy
 // value and returns that node.
 Array.prototype.select = function(f) {
@@ skipping 111 matching lines @@
     console.error("exception: " + e);
     handleError();
   }
 }
 
 function renderTemplate() {
   schema.each(function(mod) {
     if (mod.namespace == pageBase) {
       // This page is an api page. Setup types and apiDefinition.
       module = mod;
-      apiModuleTitle = "chrome." + module.namespace;
+      apiModuleName = "chrome." + module.namespace;
       pageData.apiDefinition = module;
     }
 
     if (mod.types) {
       mod.types.each(function(type) {
         typeModule[type.id] = mod;
       });
     }
   });
 
@@ skipping 125 matching lines @@
     }
   });
 
   return retval;
 }
 
 function getTypeRefPage(type) {
   return typeModule[type.$ref].namespace + ".html";
 }
 
+function getPageName() {
+  var pageDataName = getDataFromPageHTML("pageData-name");
+  // Allow empty string to be explitly set via pageData.
+  if (pageDataName == "") {
+    return pageDataName;
+  }
+
+  return pageDataName || apiModuleName || pageName;
+}
+
 function getPageTitle() {
+  var pageName = getPageName();
   var pageTitleSuffix = "Google Chrome Extensions - Google Code";
-  var pageDataTitle = getDataFromPageHTML("pageData-title");
-  // Allows an emptry string to be set as the title from pageData.
-  if (pageDataTitle == "") {
+  if (pageName == "") {
     return pageTitleSuffix;
   }
 
-  return (pageDataTitle || apiModuleTitle || pageName) +
-      " - " + pageTitleSuffix;
+  return pageName + " - " + pageTitleSuffix;
 }
 
 function getModuleName() {
   return "chrome." + module.namespace;
 }
 
 function getFullyQualifiedFunctionName(func) {
   return getModuleName() + "." + func.name;
 }
 
@@ skipping 53 matching lines @@
 
 function sortByName(a, b) {
   if (a.name < b.name) {
     return -1;
   }
   if (a.name > b.name) {
     return 1;
   }
   return 0;
 }