Handful of changes to get views building again. The tab.cc ifdefs are

only short term. I'll stub out parts of chrome_menu next so that these
can be removed.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/115406

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16178 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 22 insertions, 6 deletions

diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index d5aa9a3..55fadc2 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -5,13 +5,16 @@
 #include "chrome/browser/views/tabs/tab.h"
 
 #include "app/gfx/canvas.h"
+#include "app/gfx/font.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/size.h"
 #include "grit/generated_resources.h"
+#if defined(OS_WIN)
 #include "views/controls/menu/chrome_menu.h"
 #include "views/widget/tooltip_manager.h"
+#endif
 #include "views/widget/widget.h"
 
 const std::string Tab::kTabClassName = "browser/tabs/Tab";
@@ -20,6 +23,7 @@ static const SkScalar kTabCapWidth = 15;
 static const SkScalar kTabTopCurveWidth = 4;
 static const SkScalar kTabBottomCurveWidth = 3;
 
+#if defined(OS_WIN)
 class Tab::ContextMenuController : public views::MenuDelegate {
  public:
   explicit ContextMenuController(Tab* tab)
@@ -119,6 +123,7 @@ class Tab::ContextMenuController : public views::MenuDelegate {
 
   DISALLOW_COPY_AND_ASSIGN(ContextMenuController);
 };
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tab, public:
@@ -126,14 +131,19 @@ class Tab::ContextMenuController : public views::MenuDelegate {
 Tab::Tab(TabDelegate* delegate)
     : TabRenderer(),
       delegate_(delegate),
-      closing_(false),
-      menu_controller_(NULL) {
+      closing_(false)
+#if defined(OS_WIN)
+      , menu_controller_(NULL) {
+#else
+      {
+#endif
   close_button()->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_CLOSE));
   close_button()->SetAnimationDuration(0);
   SetContextMenuController(this);
 }
 
 Tab::~Tab() {
+#if defined(OS_WIN)
   if (menu_controller_) {
     // The menu is showing. Close the menu.
     menu_controller_->Cancel();
@@ -141,6 +151,7 @@ Tab::~Tab() {
     // Invoke this so that we hide the highlight.
     ContextMenuClosed();
   }
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -211,7 +222,9 @@ bool Tab::GetTooltipText(int x, int y, std::wstring* tooltip) {
 bool Tab::GetTooltipTextOrigin(int x, int y, gfx::Point* origin) {
   gfx::Font font;
   origin->set_x(title_bounds().x() + 10);
+#if defined(OS_WIN)
   origin->set_y(-views::TooltipManager::GetTooltipHeight() - 4);
+#endif
   return true;
 }
 
@@ -232,11 +245,13 @@ bool Tab::GetAccessibleName(std::wstring* name) {
 
 void Tab::ShowContextMenu(views::View* source, int x, int y,
                           bool is_mouse_gesture) {
+#if defined(OS_WIN)
   if (menu_controller_)
     return;
   menu_controller_ = new ContextMenuController(this);
   menu_controller_->RunMenuAt(x, y);
   // ContextMenuController takes care of deleting itself.
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -278,5 +293,7 @@ void Tab::MakePathForTab(gfx::Path* path) const {
 
 void Tab::ContextMenuClosed() {
   delegate()->StopAllHighlighting();
+#if defined(OS_WIN)
   menu_controller_ = NULL;
+#endif
 }
diff --git a/chrome/browser/views/tabs/tab.h b/chrome/browser/views/tabs/tab.h
index 920a849..15737aa 100644
--- a/chrome/browser/views/tabs/tab.h
+++ b/chrome/browser/views/tabs/tab.h
@@ -129,8 +129,10 @@ class Tab : public TabRenderer,
   // True if the tab is being animated closed.
   bool closing_;
 
+#if defined(OS_WIN)
   // If non-null it means we're showing a menu for the tab.
   ContextMenuController* menu_controller_;
+#endif
 
   DISALLOW_COPY_AND_ASSIGN(Tab);
 };
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index c27ece6..20df3bb 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -10,7 +10,6 @@
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/win_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/profile.h"
@@ -34,7 +33,6 @@ static const int kCloseButtonVertFuzz = 0;
 static const int kCloseButtonHorzFuzz = 5;
 static const int kFaviconSize = 16;
 static const int kSelectedTitleColor = SK_ColorBLACK;
-static const int kUnselectedTitleColor = SkColorSetRGB(64, 64, 64);
 
 // How long the hover state takes.
 static const int kHoverDurationMs = 90;
@@ -214,8 +212,8 @@ TabRenderer::TabRenderer()
       showing_icon_(false),
       showing_download_icon_(false),
       showing_close_button_(false),
-      crash_animation_(NULL),
       fav_icon_hiding_offset_(0),
+      crash_animation_(NULL),
       should_display_crashed_favicon_(false),
       theme_provider_(NULL) {
   InitResources();
@@ -676,7 +674,6 @@ void TabRenderer::PaintActiveTabBackground(gfx::Canvas* canvas) {
 
 void TabRenderer::PaintHoverTabBackground(gfx::Canvas* canvas,
                                           double opacity) {
-  bool is_otr = data_.off_the_record;
   SkBitmap left = skia::ImageOperations::CreateBlendedBitmap(
                   *tab_inactive.image_l, *tab_active.image_l, opacity);
   SkBitmap center = skia::ImageOperations::CreateBlendedBitmap(