add mole info to toolstrip definition and enable moles

chrome/browser/extensions/extension_host.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/extensions/extension_host.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
+#include "chrome/common/render_messages.h"
 
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 #include "webkit/glue/context_menu.h"
 
 namespace {
 
 class CrashedExtensionInfobarDelegate : public ConfirmInfoBarDelegate {
@@ skipping 94 matching lines @@
   render_view_host_->set_view(host_view);
   render_view_host_->CreateRenderView();
   render_view_host_->NavigateToURL(url_);
   DCHECK(IsRenderViewLive());
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_PROCESS_CREATED,
       Source<Profile>(profile_),
       Details<ExtensionHost>(this));
 }
 
+void ExtensionHost::NavigateToURL(const GURL& url) {
+  url_ = url;
+  render_view_host_->NavigateToURL(url_);
+}
+
 void ExtensionHost::RecoverCrashedExtension() {
   DCHECK(!IsRenderViewLive());
 #if defined(TOOLKIT_VIEWS)
   if (view_.get()) {
     // The view should call us back to CreateRenderView, which is the place
     // where we create the render process and fire notification.
     view_->RecoverCrashedExtension();
   } else {
     CreateRenderView(NULL);
   }
@@ skipping 18 matching lines @@
       current_tab->AddInfoBar(
           new CrashedExtensionInfobarDelegate(current_tab, this));
     }
   }
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_PROCESS_CRASHED,
       Source<Profile>(profile_),
       Details<ExtensionHost>(this));
 }
 
+void ExtensionHost::DidNavigate(RenderViewHost* render_view_host,
+    const ViewHostMsg_FrameNavigate_Params& params) {
+  // We only care when the outer frame changes.
+  switch (params.transition) {
+    case PageTransition::AUTO_SUBFRAME:
+    case PageTransition::MANUAL_SUBFRAME:
+      return;
+  }
+      
+  extension_function_dispatcher_.reset(
+      new ExtensionFunctionDispatcher(render_view_host_, this, url_));

[Matt Perry, 2009/07/24 23:11:11]

I think we need to use params.url here, or this won't work for
renderer-initiated navigations.  We probably also want to update url_.

+}
+
 void ExtensionHost::DidStopLoading(RenderViewHost* render_view_host) {
-  // TODO(aa): This is toolstrip-specific and should probably not be here.
-  // ExtensionToolstrip in bookmark_bar_view.cc?
-  static const StringPiece toolstrip_css(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_EXTENSIONS_TOOLSTRIP_CSS));
-  render_view_host->InsertCSSInWebFrame(L"", toolstrip_css.as_string());
+#if defined(TOOLKIT_VIEWS)
+  ExtensionView* view = view_.get();
+  if (view) {
+    // TODO(erikkay) this injection should really happen in the renderer.
+    // When the Jerry's view type change lands, investigate moving this there.
+
+    // As a toolstrip, inject our toolstrip CSS to make it easier for toolstrips
+    // to blend in with the chrome UI.
+    if (view->is_toolstrip()) {
+      static const StringPiece toolstrip_css(
+          ResourceBundle::GetSharedInstance().GetRawDataResource(
+              IDR_EXTENSIONS_TOOLSTRIP_CSS));
+      render_view_host->InsertCSSInWebFrame(L"", toolstrip_css.as_string());
+    } else {
+      // No CSS injecting currently, but call SetDidInsertCSS to tell the view
+      // that it's OK to display.
+      view->SetDidInsertCSS(true);
+    }
+  }
+#endif
 
   did_stop_loading_ = true;
 }
 
 void ExtensionHost::RunJavaScriptMessage(const std::wstring& message,
                                          const std::wstring& default_prompt,
                                          const GURL& frame_url,
                                          const int flags,
                                          IPC::Message* reply_msg,
                                          bool* did_suppress_message) {
@@ skipping 18 matching lines @@
 }
 
 void ExtensionHost::DidInsertCSS() {
 #if defined(TOOLKIT_VIEWS)
   if (view_.get())
     view_->SetDidInsertCSS(true);
 #endif
 }
 
 RenderViewHostDelegate::View* ExtensionHost::GetViewDelegate() {
-  // TODO(erikkay) this is unfortunate.  The interface declares that this method
-  // must be const (no good reason for it as far as I can tell) which means you
-  // can't return self without doing this const_cast.  Either we need to change
-  // the interface, or we need to split out the view delegate into another
-  // object (which is how TabContents works).
   return this;
 }
 
 void ExtensionHost::CreateNewWindow(int route_id,
                                     base::WaitableEvent* modal_dialog_event) {
   delegate_view_helper_.CreateNewWindow(
       route_id, modal_dialog_event, render_view_host()->process()->profile(),
       site_instance());
 }
 
 void ExtensionHost::CreateNewWidget(int route_id, bool activatable) {
   delegate_view_helper_.CreateNewWidget(route_id, activatable,
                                         site_instance()->GetProcess());
 }
 
 void ExtensionHost::ShowCreatedWindow(int route_id,
                                       WindowOpenDisposition disposition,
                                       const gfx::Rect& initial_pos,
                                       bool user_gesture,
                                       const GURL& creator_url) {
   TabContents* contents = delegate_view_helper_.GetCreatedWindow(route_id);
   if (contents) {
     Browser* browser = GetBrowser();
     DCHECK(browser);
     if (!browser)
       return;
-    // TODO(erikkay) is it safe to pass in NULL as source?
     browser->AddTabContents(contents, disposition, initial_pos,
                             user_gesture);
   }
 }
 
 void ExtensionHost::ShowCreatedWidget(int route_id,
                                       const gfx::Rect& initial_pos) {
   RenderWidgetHostView* widget_host_view =
       delegate_view_helper_.GetCreatedWidget(route_id);
   Browser *browser = GetBrowser();
@@ skipping 50 matching lines @@
   // NOTE(rafaelw): This can return NULL in some circumstances. In particular,
   // a toolstrip or background_page onload chrome.tabs api call can make it
   // into here before the browser is sufficiently initialized to return here.
   // A similar situation may arise during shutdown.
   // TODO(rafaelw): Delay creation of background_page until the browser
   // is available. http://code.google.com/p/chromium/issues/detail?id=13284
   return browser;
 }
 
 void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
-  extension_function_dispatcher_.reset(
-      new ExtensionFunctionDispatcher(render_view_host_, this, url_));
 }