diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 00:17:09 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 00:17:09 +0000 |
| commit | 19e62f6764015f64229506dcaa131f4ddc52b93a (patch) | |
| tree | 9736fd2c60251ec2fae655a2835ecfb0e6c04ed3 /chrome/browser/views/tabs | |
| parent | af0e7e96c0a27919e2d7c9b68b045c7b20dd7fe7 (diff) | |
| download | chromium_src-19e62f6764015f64229506dcaa131f4ddc52b93a.zip chromium_src-19e62f6764015f64229506dcaa131f4ddc52b93a.tar.gz chromium_src-19e62f6764015f64229506dcaa131f4ddc52b93a.tar.bz2 | |
People should just use GetWindow() instead of calling GetWidget()->GetWindow()
Review URL: http://codereview.chromium.org/102020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tabs')
| -rw-r--r-- | chrome/browser/views/tabs/dragged_tab_controller.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_renderer.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index dd4a2e11..7a7bf9d 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -723,7 +723,7 @@ void DraggedTabController::Attach(TabStrip* attached_tabstrip, tab->SetVisible(false); // Move the corresponding window to the front. - attached_tabstrip_->GetWidget()->GetWindow()->Activate(); + attached_tabstrip_->GetWindow()->Activate(); } void DraggedTabController::Detach() { diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 047da51..107af980 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -507,10 +507,8 @@ void TabRenderer::OnMouseExited(const views::MouseEvent& e) { } void TabRenderer::ThemeChanged() { - if (GetWidget() && GetWidget()->GetWindow()) { - LoadTabImages( - GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame()); - } + if (GetWindow()) + LoadTabImages(GetWindow()->GetNonClientView()->UseNativeFrame()); View::ThemeChanged(); } @@ -545,7 +543,7 @@ void TabRenderer::PaintTabBackground(ChromeCanvas* canvas) { animation = pulse_animation_.get(); if (animation->GetCurrentValue() > 0) { PaintHoverTabBackground(canvas, animation->GetCurrentValue() * - (GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame() ? + (GetWindow()->GetNonClientView()->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 1b1acac..34c0ce9 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -601,7 +601,7 @@ void TabStrip::PaintChildren(ChromeCanvas* canvas) { } } - if (GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame()) { + if (GetWindow()->GetNonClientView()->UseNativeFrame()) { // Make sure unselected tabs are somewhat transparent. SkPaint paint; paint.setColor(SkColorSetARGB(200, 255, 255, 255)); |