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

4 files changed, 8 insertions, 10 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));
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 4fffe14..81ea797 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -399,7 +399,7 @@ void BrowserToolbarView::Paint(ChromeCanvas* canvas) {
   // For glass, we need to draw a black line below the location bar to separate
   // it from the content area.  For non-glass, the NonClientView draws the
   // toolbar background below the location bar for us.
-  if (GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame())
+  if (GetWindow()->GetNonClientView()->UseNativeFrame())
     canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1);
 }
 
@@ -554,7 +554,7 @@ gfx::Size BrowserToolbarView::GetPreferredSize() {
   }
 
   int vertical_spacing = PopupTopSpacing() +
-      (GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame() ?
+      (GetWindow()->GetNonClientView()->UseNativeFrame() ?
           kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass);
   return gfx::Size(0, location_bar_->GetPreferredSize().height() +
       vertical_spacing);
@@ -888,7 +888,7 @@ gfx::Rect BrowserToolbarView::GetPopupBounds() const {
 
 // static
 int BrowserToolbarView::PopupTopSpacing() {
-  return GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame() ?
+  return GetWindow()->GetNonClientView()->UseNativeFrame() ?
       0 : kPopupTopSpacingNonGlass;
 }