Experiment with dislodging the Extension Shelf and having it only appear on t...

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 940 matching lines @@
   // When it's the first load, we know either the pending one or the committed
   // one will have the DOM UI in it (see GetDOMUIForCurrentState), and only one
   // of them will be valid, so we can just check both.
   if (render_manager_.pending_dom_ui())
     return render_manager_.pending_dom_ui()->force_bookmark_bar_visible();
   if (render_manager_.dom_ui())
     return render_manager_.dom_ui()->force_bookmark_bar_visible();
   return false;  // Default.
 }
 
+bool TabContents::IsExtensionShelfAlwaysVisible() {
+  // See GetDOMUIForCurrentState() comment for more info. This case is very
+  // similar, but for non-first loads, we want to use the committed entry. This
+  // is so the bookmarks bar disappears at the same time the page does.
+  if (controller_.GetLastCommittedEntry()) {
+    // Not the first load, always use the committed DOM UI.
+    if (render_manager_.dom_ui())
+      return render_manager_.dom_ui()->force_extension_shelf_visible();
+    return false;  // Default.
+  }
+
+  // When it's the first load, we know either the pending one or the committed
+  // one will have the DOM UI in it (see GetDOMUIForCurrentState), and only one
+  // of them will be valid, so we can just check both.
+  if (render_manager_.pending_dom_ui())
+    return render_manager_.pending_dom_ui()->force_extension_shelf_visible();
+  if (render_manager_.dom_ui())
+    return render_manager_.dom_ui()->force_extension_shelf_visible();
+  return false;  // Default.
+}
+
 void TabContents::ToolbarSizeChanged(bool is_animating) {
   TabContentsDelegate* d = delegate();
   if (d)
     d->ToolbarSizeChanged(this, is_animating);
 }
 
 void TabContents::OnStartDownload(DownloadItem* download) {
   DCHECK(download);
 
   // Download in a constrained popup is shown in the tab that opened it.
@@ skipping 1476 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }