diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-14 03:13:06 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-14 03:13:06 +0000 |
| commit | e56bbc990c6855f286ebf74e88e1bca0227fe210 (patch) | |
| tree | 5ed565ac79a99800fa5cc66b65d52dd40a61a032 /chrome/browser/views/tabs | |
| parent | 6b33e4da472b3c474a3f1328fdba4a84d4a91886 (diff) | |
| download | chromium_src-e56bbc990c6855f286ebf74e88e1bca0227fe210.zip chromium_src-e56bbc990c6855f286ebf74e88e1bca0227fe210.tar.gz chromium_src-e56bbc990c6855f286ebf74e88e1bca0227fe210.tar.bz2 | |
rollback again
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tabs')
| -rw-r--r-- | chrome/browser/views/tabs/tab_renderer.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 654acea..f1c0e07 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -15,8 +15,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/non_client_view.h" -#include "chrome/views/widget.h" #include "chrome/views/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -501,7 +499,7 @@ void TabRenderer::OnMouseExited(const views::MouseEvent& e) { void TabRenderer::ThemeChanged() { if (GetWidget() && GetWidget()->AsWindow()) - LoadTabImages(GetWidget()->AsWindow()->GetNonClientView()->UseNativeFrame()); + LoadTabImages(GetWidget()->AsWindow()->UseNativeFrame()); View::ThemeChanged(); } @@ -536,7 +534,7 @@ void TabRenderer::PaintTabBackground(ChromeCanvas* canvas) { animation = pulse_animation_.get(); if (animation->GetCurrentValue() > 0) { PaintHoverTabBackground(canvas, animation->GetCurrentValue() * - (GetWidget()->AsWindow()->GetNonClientView()->UseNativeFrame() ? + (GetWidget()->AsWindow()->UseNativeFrame() ? kHoverOpacityVista : kHoverOpacity)); } else { PaintInactiveTabBackground(canvas); diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index d2d4beb..7b26c78 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -25,7 +25,6 @@ #include "chrome/common/win_util.h" #include "chrome/views/image_view.h" #include "chrome/views/painter.h" -#include "chrome/views/non_client_view.h" #include "chrome/views/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -599,7 +598,7 @@ void TabStrip::PaintChildren(ChromeCanvas* canvas) { } } - if (GetWidget()->AsWindow()->GetNonClientView()->UseNativeFrame()) { + if (GetWidget()->AsWindow()->UseNativeFrame()) { // Make sure unselected tabs are somewhat transparent. SkPaint paint; paint.setColor(SkColorSetARGB(200, 255, 255, 255)); |