Bring the gh-pages branch up to date with the master branch

netlog_viewer/main.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * Dictionary of constants (Initialized soon after loading by data from browser,
  * updated on load log).  The *Types dictionaries map strings to numeric IDs,
  * while the *TypeNames are the other way around.
  */
 var EventType = null;
@@ skipping 50 matching lines @@
 
     // This must be the first constants observer, so other constants observers
     // can safely use the globals, rather than depending on walking through
     // the constants themselves.
     g_browser.addConstantsObserver(new ConstantsObserver());
 
     // Create the tab switcher.
     this.initTabs_();
 
     // Cut out a small vertical strip at the top of the window, to display
-    // a high level status (i.e. if we are capturing events, or displaying a
-    // log file). Below it we will position the main tabs and their content
-    // area.
+    // a high level status (i.e. if we are displaying a log file or not).
+    // Below it we will position the main tabs and their content area.
     this.topBarView_ = TopBarView.getInstance(this);
     var verticalSplitView = new VerticalSplitView(
         this.topBarView_, this.tabSwitcher_);
 
     superClass.call(this, verticalSplitView);
 
     // Trigger initial layout.
     this.resetGeometry();
 
     window.onhashchange = this.onUrlHashChange_.bind(this);
@@ skipping 37 matching lines @@
      * HTML elements that send messages to the browser.  Cannot be undone
      * without reloading the page.  Must be called before passing loaded data
      * to the individual views.
      *
      * @param {string} opt_fileName The name of the log file that has been
      *     loaded, if we're loading a log file.
      */
     onLoadLog: function(opt_fileName) {
       isViewingLoadedLog = true;
 
-      this.stopCapturing();
       if (opt_fileName != undefined) {
-        // If there's a file name, a log file was loaded, so swap out the status
-        // bar to indicate we're no longer capturing events.
+        // If there's a file name, a log file was loaded, so display the
+        // file's name in the status bar.
         this.topBarView_.switchToSubView('loaded').setFileName(opt_fileName);
         SourceTracker.getInstance().setPrivacyStripping(false);
       }
     },
 
     switchToViewOnlyMode: function() {
       // Since this won't be dumped to a file, we don't want to remove
       // cookies and credentials.
       log_util.createLogDumpAsync('', log_util.loadLogFile, false);
     },
 
-    stopCapturing: function() {
-      g_browser.disable();
-      document.styleSheets[0].insertRule(
-          '.hide-when-not-capturing { display: none; }', 0);
-    },
-
     initTabs_: function() {
       this.tabIdToHash_ = {};
       this.hashToTabId_ = {};
 
       this.tabSwitcher_ = new TabSwitcherView(this.onTabSwitched_.bind(this));
 
       // Helper function to add a tab given the class for a view singleton.
       var addTab = function(viewClass) {
         var tabId = viewClass.TAB_ID;
         var tabHash = viewClass.TAB_HASH;
@@ skipping 20 matching lines @@
       addTab(ProxyView);
       addTab(EventsView);
       addTab(TimelineView);
       addTab(DnsView);
       addTab(SocketsView);
       addTab(AltSvcView);
       addTab(SpdyView);
       addTab(QuicView);
       addTab(SdchView);
       addTab(HttpCacheView);
-      // TODO(rayraymond): Re-enable, Modules, Bandwidth, and Prerender tabs.
-      // addTab(ModulesView);
-      // addTab(BandwidthView);
-      // addTab(PrerenderView);
+      addTab(ModulesView);
+      addTab(BandwidthView);
+      addTab(PrerenderView);
       addTab(CrosView);
 
+      // Tab links start off hidden (besides import) since a log file has not
+      // been loaded yet. This must be done after all the tabs are added so
+      // that the width of the tab-list div is correctly styled.
+      for (var tabId in this.tabSwitcher_.getAllTabViews()) {
+        if (tabId != ImportView.TAB_ID) {
+          this.tabSwitcher_.showTabLink(tabId, false);
+        }
+      }
+
       this.tabSwitcher_.showTabLink(CrosView.TAB_ID, cr.isChromeOS);
     },
 
     /**
      * This function is called by the tab switcher when the current tab has been
      * changed. It will update the current URL to reflect the new active tab,
      * so the back can be used to return to previous view.
      */
     onTabSwitched_: function(oldTabId, newTabId) {
       // Update data needed by newly active tab, as it may be
@@ skipping 177 matching lines @@
  *
  * Example: sdchProblemCodeToString(5) should return
  * "DECODE_BODY_ERROR".
  * @param {number} sdchProblemCode The SDCH problem code.
  * @return {string} The name of the given problem code.
  */
 function sdchProblemCodeToString(sdchProblemCode) {
   return getKeyWithValue(SdchProblemCode, sdchProblemCode);
 }