summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/tabs/tab_renderer.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-15 20:37:42 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-15 20:37:42 +0000
commit7d3feb91489d40903324d07d7cbe275adb9af0df (patch)
tree675beeef2c355189229cd6586640f88fa430ffa0 /chrome/browser/views/tabs/tab_renderer.cc
parentbea5f17bd4205def93822c5d74c0519c1f21337c (diff)
downloadchromium_src-7d3feb91489d40903324d07d7cbe275adb9af0df.zip
chromium_src-7d3feb91489d40903324d07d7cbe275adb9af0df.tar.gz
chromium_src-7d3feb91489d40903324d07d7cbe275adb9af0df.tar.bz2
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
Diffstat (limited to 'chrome/browser/views/tabs/tab_renderer.cc')
-rw-r--r--chrome/browser/views/tabs/tab_renderer.cc5
1 files changed, 1 insertions, 4 deletions
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(