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

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/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 162 matching lines @@
   if (params.url.host() != extension_->id()) {
     extension_function_dispatcher_.reset(NULL);
     return;
   }
 
   url_ = params.url;
   extension_function_dispatcher_.reset(
       new ExtensionFunctionDispatcher(render_view_host_, this, url_));
 }
 
-void ExtensionHost::InsertCssIfToolstrip() {
+void ExtensionHost::InsertThemeCSS() {
+  DCHECK(!is_background_page());
 
-  // TODO(erikkay): Make these ifdefs go away -- http://crbug.com/21939
-#if defined(TOOLKIT_VIEWS)
-  ExtensionView* view = view_.get();
-  if (!view)
-    return;
-  if (!view->is_toolstrip()) {
-    // No CSS injecting currently, but call SetDidInsertCSS to tell the view
-    // that it's OK to display.
-    view->SetDidInsertCSS(true);
-    return;
-  }
-#elif defined(OS_LINUX) || defined(OS_MACOSX)
-#if defined(OS_LINUX)
-  ExtensionViewGtk* view = view_.get();
-#else
-  ExtensionViewMac* view = view_.get();
-#endif
-  if (!view || !view->is_toolstrip())
-    return;
-#endif
+  static const base::StringPiece toolstrip_theme_css(
+      ResourceBundle::GetSharedInstance().GetRawDataResource(
+      IDR_EXTENSIONS_TOOLSTRIP_THEME_CSS));
 
-  static const base::StringPiece toolstrip_css(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_EXTENSIONS_TOOLSTRIP_CSS));
-
-  std::string css = toolstrip_css.as_string();
+  std::string css = toolstrip_theme_css.as_string();
   ThemeProvider* theme_provider =
       render_view_host()->process()->profile()->GetThemeProvider();
 
   SkColor text_color = theme_provider ?
       theme_provider->GetColor(BrowserThemeProvider::COLOR_BOOKMARK_TEXT) :
       SK_ColorBLACK;
 
   std::string hex_color_string = StringPrintf(
       "#%02x%02x%02x", SkColorGetR(text_color),
                        SkColorGetG(text_color),
                        SkColorGetB(text_color));
   size_t pos = css.find(kToolstripTextColorSubstitution);
   while (pos != std::string::npos) {
     css.replace(pos, 12, hex_color_string);
     pos = css.find(kToolstripTextColorSubstitution);
   }
 
-  // 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.
-  render_view_host()->InsertCSSInWebFrame(L"", css, "ToolstripDefaultCss");
+  render_view_host()->InsertCSSInWebFrame(L"", css, "ToolstripThemeCSS");
 }
 
 void ExtensionHost::DidStopLoading(RenderViewHost* render_view_host) {
-  InsertCssIfToolstrip();
   if (!did_stop_loading_) {
     NotificationService::current()->Notify(
         NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
         Source<Profile>(profile_),
         Details<ExtensionHost>(this));
     did_stop_loading_ = true;
   }
+  if (extension_host_type_ == ViewType::EXTENSION_TOOLSTRIP ||
+      extension_host_type_ == ViewType::EXTENSION_MOLE) {
+#if defined(TOOLKIT_VIEWS)
+    if (view_.get())
+      view_->DidStopLoading();
+#endif
+  }
 }
 
 void ExtensionHost::DocumentAvailableInMainFrame(RenderViewHost* rvh) {
   document_element_available_ = true;
   if (is_background_page())
     extension_->SetBackgroundPageReady();
+  else
+    InsertThemeCSS();
 }
 
 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) {
   // Automatically cancel the javascript alert (otherwise the renderer hangs
   // indefinitely).
@@ skipping 10 matching lines @@
 void ExtensionHost::ProcessDOMUIMessage(const std::string& message,
                                         const std::string& content,
                                         int request_id,
                                         bool has_callback) {
   if (extension_function_dispatcher_.get()) {
     extension_function_dispatcher_->HandleRequest(message, content, request_id,
                                                   has_callback);
   }
 }
 
-void ExtensionHost::DidInsertCSS() {
-#if defined(TOOLKIT_VIEWS)
-  if (view_.get())
-    view_->SetDidInsertCSS(true);
-#endif
-}
-
 RenderViewHostDelegate::View* ExtensionHost::GetViewDelegate() {
   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(), DOMUIFactory::GetDOMUIType(url_));
 }
@@ skipping 86 matching lines @@
   // valid here?
   // 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::SetRenderViewType(ViewType::Type type) {
+  DCHECK(type == ViewType::EXTENSION_MOLE ||
+         type == ViewType::EXTENSION_TOOLSTRIP);
+  extension_host_type_ = type;
+  render_view_host()->ViewTypeChanged(extension_host_type_);
+}
+
 ViewType::Type ExtensionHost::GetRenderViewType() const {
   return extension_host_type_;
 }
 
 void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
   // TODO(mpcomplete): This is duplicated in DidNavigate, which means that
   // we'll create 2 EFDs for the first navigation. We should try to find a
   // better way to unify them.
   // See http://code.google.com/p/chromium/issues/detail?id=18240
   extension_function_dispatcher_.reset(
       new ExtensionFunctionDispatcher(render_view_host, this, url_));
 
   render_view_host->Send(new ViewMsg_EnableIntrinsicWidthChangedMode(
       render_view_host->routing_id()));
 }
 
 int ExtensionHost::GetBrowserWindowID() const {
   int window_id = -1;
   if (extension_host_type_ == ViewType::EXTENSION_TOOLSTRIP) {
     window_id = ExtensionTabUtil::GetWindowId(
         const_cast<ExtensionHost* >(this)->GetBrowser());
   } else if (extension_host_type_ == ViewType::EXTENSION_BACKGROUND_PAGE) {
     // Background page is not attached to any browser window, so pass -1.
     window_id = -1;
   } else {
     NOTREACHED();
   }
   return window_id;
 }