Change the view mode when switching between moles and toolstrips, and

chrome/browser/views/extensions/extension_view.cc

 // Copyright (c) 2006-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/views/extensions/extension_view.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #if defined(OS_WIN)
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 #endif
 #include "views/widget/widget.h"
 
 ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser)
     : host_(host), browser_(browser),
       initialized_(false), pending_preferred_width_(0), container_(NULL),
-      did_insert_css_(false), is_clipped_(false), is_toolstrip_(true) {
+      did_stop_loading_(false), is_clipped_(false), is_toolstrip_(true) {
   host_->set_view(this);
 }
 
 ExtensionView::~ExtensionView() {
   View* parent = GetParent();
   if (parent)
     parent->RemoveChildView(this);
   CleanUp();
 }
 
 Extension* ExtensionView::extension() const {
   return host_->extension();
 }
 
 RenderViewHost* ExtensionView::render_view_host() const {
   return host_->render_view_host();
 }
 
-void ExtensionView::SetDidInsertCSS(bool did_insert) {
-  did_insert_css_ = did_insert;
+void ExtensionView::DidStopLoading() {
+  did_stop_loading_ = true;
   ShowIfCompletelyLoaded();
 }
 
 void ExtensionView::SetVisible(bool is_visible) {
   if (is_visible != IsVisible()) {
     NativeViewHost::SetVisible(is_visible);
 
     // Also tell RenderWidgetHostView the new visibility. Despite its name, it
     // is not part of the View heirarchy and does not know about the change
     // unless we tell it.
@@ skipping 44 matching lines @@
     render_view_host()->view()->SetBackground(pending_background_);
     pending_background_.reset();
   }
 }
 
 void ExtensionView::ShowIfCompletelyLoaded() {
   // We wait to show the ExtensionView until it has loaded, our parent has
   // given us a background and css has been inserted into page. These can happen
   // in different orders.
   if (!IsVisible() && host_->did_stop_loading() && render_view_host()->view() &&
-      !is_clipped_ && did_insert_css_ &&
+      !is_clipped_ && did_stop_loading_ &&
       !render_view_host()->view()->background().empty()) {
     SetVisible(true);
     UpdatePreferredWidth(pending_preferred_width_);
   }
 }
 
 void ExtensionView::CleanUp() {
   if (!initialized_)
     return;
   if (native_view())
@@ skipping 33 matching lines @@
 
 void ExtensionView::HandleMouseEvent() {
   if (container_)
     container_->OnExtensionMouseEvent(this);
 }
 
 void ExtensionView::HandleMouseLeave() {
   if (container_)
     container_->OnExtensionMouseLeave(this);
 }