Add a bare-bones extension shelf that displays extension items on OS X.

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 53 matching lines @@
 
 void ExtensionHost::CreateView(Browser* browser) {
 #if defined(TOOLKIT_VIEWS)
   view_.reset(new ExtensionView(this, browser));
   // We own |view_|, so don't auto delete when it's removed from the view
   // hierarchy.
   view_->SetParentOwned(false);
 #elif defined(OS_LINUX)
   view_.reset(new ExtensionViewGtk(this, browser));
   view_->Init();
+#elif defined(OS_MACOSX)
+  view_.reset(new ExtensionViewMac(this, browser));
+  view_->Init();
 #else
   // TODO(port)
   NOTREACHED();
 #endif
 }
 
 RenderProcessHost* ExtensionHost::render_process_host() const {
   return render_view_host_->process();
 }
 
@@ skipping 39 matching lines @@
 
 void ExtensionHost::Observe(NotificationType type,
                             const NotificationSource& source,
                             const NotificationDetails& details) {
   DCHECK(type == NotificationType::EXTENSION_BACKGROUND_PAGE_READY);
   DCHECK(extension_->GetBackgroundPageReady());
   NavigateToURL(url_);
 }
 
 void ExtensionHost::UpdatePreferredWidth(int pref_width) {
-#if defined(TOOLKIT_VIEWS) || defined(OS_LINUX)
   if (view_.get())
     view_->UpdatePreferredWidth(pref_width);
-#endif
 }
 
 void ExtensionHost::RenderViewGone(RenderViewHost* render_view_host) {
   DCHECK_EQ(render_view_host_, render_view_host);
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_PROCESS_CRASHED,
       Source<ExtensionsService>(profile_->GetExtensionsService()),
       Details<ExtensionHost>(this));
 }
 
@@ skipping 26 matching lines @@
     extension_function_dispatcher_.reset(NULL);
     return;
   }
 
   url_ = params.url;
   extension_function_dispatcher_.reset(
       new ExtensionFunctionDispatcher(render_view_host_, this, url_));
 }
 
 void ExtensionHost::InsertCssIfToolstrip() {
+
+  // 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)
+#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_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_EXTENSIONS_TOOLSTRIP_CSS));
 
   std::string css = toolstrip_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);
   }
 
-#if defined(TOOLKIT_VIEWS) || defined(OS_LINUX)
   // 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");
-#endif
 }
 
 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;
@@ skipping 116 matching lines @@
 }
 
 void ExtensionHost::HandleMouseLeave() {
 #if defined(OS_WIN)
   if (view_.get())
     view_->HandleMouseLeave();
 #endif
 }
 
 Browser* ExtensionHost::GetBrowser() {
-#if defined(OS_WIN) || defined(OS_LINUX)
   if (view_.get())
     return view_->browser();
-#endif
+
   Profile* profile = render_view_host()->process()->profile();
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
 
   // It's possible for a browser to exist, but to have never been active.
   // This can happen if you launch the browser on a machine without an active
   // desktop (a headless buildbot) or if you quickly give another app focus
   // at launch time.  This is easy to do with browser_tests.
   if (!browser)
     browser = BrowserList::FindBrowserWithProfile(profile);
 
@@ skipping 30 matching lines @@
     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;
 }