Further cleanup of delegate==NULL cases.

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/frame/opaque_browser_frame_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/compiler_specific.h"
@@ skipping 201 matching lines @@
     window_icon_->Update();
 }
 
 gfx::Size OpaqueBrowserFrameView::GetMinimumSize() {
   gfx::Size min_size(browser_view_->GetMinimumSize());
   int border_thickness = NonClientBorderThickness();
   min_size.Enlarge(2 * border_thickness,
                    NonClientTopBorderHeight(false, false) + border_thickness);
 
   views::WindowDelegate* delegate = frame_->GetWindow()->GetDelegate();
-  if (delegate == NULL) {
-    LOG(INFO) << "delegate is NULL, returning safe default.";
-    return min_size;
-  }
   int min_titlebar_width = (2 * FrameBorderThickness(false)) +
       kIconLeftSpacing +
-      (delegate->ShouldShowWindowIcon() ? (IconSize() + kTitleLogoSpacing) : 0);
+      (delegate && delegate->ShouldShowWindowIcon() ?
+       (IconSize() + kTitleLogoSpacing) : 0);
 #if !defined(OS_CHROMEOS)
   min_titlebar_width +=
       minimize_button_->GetMinimumSize().width() +
       restore_button_->GetMinimumSize().width() +
       close_button_->GetMinimumSize().width();
 #endif
   min_size.set_width(std::max(min_size.width(), min_titlebar_width));
   return min_size;
 }
 
@@ skipping 55 matching lines @@
       maximize_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
       point))
     return HTMAXBUTTON;
   if (minimize_button_->IsVisible() &&
       minimize_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
       point))
     return HTMINBUTTON;
 
   views::WindowDelegate* delegate = frame_->GetWindow()->GetDelegate();
   if (delegate == NULL) {
-    LOG(INFO) << "delegate is NULL, returning safe default.";
-    return HTNOWHERE;
+    LOG(WARNING) << "delegate is NULL, returning safe default.";
+    return HTCAPTION;
   }
   int window_component = GetHTComponentForFrame(point, TopResizeHeight(),
       NonClientBorderThickness(), kResizeAreaCornerSize, kResizeAreaCornerSize,
       delegate->CanResize());
   // Fall back to the caption if no other component matches.
   return (window_component == HTNOWHERE) ? HTCAPTION : window_component;
 }
 
 void OpaqueBrowserFrameView::GetWindowMask(const gfx::Size& size,
                                            gfx::Path* window_mask) {
@@ skipping 97 matching lines @@
   // This function is queried during the creation of the window as the
   // TabIconView we host is initialized, so we need to NULL check the selected
   // TabContents because in this condition there is not yet a selected tab.
   TabContents* current_tab = browser_view_->GetSelectedTabContents();
   return current_tab ? current_tab->is_loading() : false;
 }
 
 SkBitmap OpaqueBrowserFrameView::GetFavIconForTabIconView() {
   views::WindowDelegate* delegate = frame_->GetWindow()->GetDelegate();
   if (delegate == NULL) {
-    LOG(INFO) << "delegate is NULL, returning safe default.";
+    LOG(WARNING) << "delegate is NULL, returning safe default.";
     return SkBitmap();
   }
   return delegate->GetWindowIcon();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, private:
 
 int OpaqueBrowserFrameView::FrameBorderThickness(bool restored) const {
   views::Window* window = frame_->GetWindow();
@@ skipping 11 matching lines @@
   return FrameBorderThickness(false) +
       ((window->IsMaximized() || window->IsFullscreen()) ?
        0 : kClientEdgeThickness);
 }
 
 int OpaqueBrowserFrameView::NonClientTopBorderHeight(
     bool restored,
     bool ignore_vertical_tabs) const {
   views::Window* window = frame_->GetWindow();
   views::WindowDelegate* delegate = window->GetDelegate();
-  // |delegate| may be NULL if called from callback of InputMethodChanged
-  // while a window is being destroyed.
+  // |delegate| may be NULL if called from callback of InputMethodChanged while
+  // a window is being destroyed.
   // See more discussion at http://crosbug.com/8958
-  if (!delegate) {
-    LOG(INFO) << "delegate is NULL";
-    return 0;
-  }
-
-  if (delegate->ShouldShowWindowTitle() ||
+  if ((delegate && delegate->ShouldShowWindowTitle()) ||
       (browser_view_->IsTabStripVisible() && !ignore_vertical_tabs &&
-      browser_view_->UseVerticalTabs())) {
+       browser_view_->UseVerticalTabs())) {
     return std::max(FrameBorderThickness(restored) + IconSize(),
         CaptionButtonY(restored) + kCaptionButtonHeightWithPadding) +
         TitlebarBottomThickness(restored);
   }
 
   return FrameBorderThickness(restored) -
       ((browser_view_->IsTabStripVisible() && !restored &&
       window->IsMaximized()) ? kTabstripTopShadowThickness : 0);
 }
 
@@ skipping 18 matching lines @@
 #else
   return std::max(BrowserFrame::GetTitleFont().GetHeight(), kIconMinimumSize);
 #endif
 }
 
 gfx::Rect OpaqueBrowserFrameView::IconBounds() const {
   int size = IconSize();
   int frame_thickness = FrameBorderThickness(false);
   int y;
   views::WindowDelegate* delegate = frame_->GetWindow()->GetDelegate();
-  if (delegate == NULL) {
-    LOG(INFO) << "delegate is NULL, returning safe default.";
-    return gfx::Rect(0, 0, 0, 0);
-  }
-  if (delegate->ShouldShowWindowIcon() || delegate->ShouldShowWindowTitle()) {
+  if (delegate && (delegate->ShouldShowWindowIcon() ||
+                   delegate->ShouldShowWindowTitle())) {
     // Our frame border has a different "3D look" than Windows'.  Theirs has a
     // more complex gradient on the top that they push their icon/title below;
     // then the maximized window cuts this off and the icon/title are centered
     // in the remaining space.  Because the apparent shape of our border is
     // simpler, using the same positioning makes things look slightly uncentered
     // with restored windows, so when the window is restored, instead of
     // calculating the remaining space from below the frame border, we calculate
     // from below the 3D edge.
     int unavailable_px_at_top = frame_->GetWindow()->IsMaximized() ?
         frame_thickness : kTitlebarTopAndBottomEdgeThickness;
@@ skipping 174 matching lines @@
     int edge_height = top_center->height() - kClientEdgeThickness;
     canvas->TileImageInt(*top_center, 0,
         window->GetClientView()->y() - edge_height, width(), edge_height);
   }
 }
 
 void OpaqueBrowserFrameView::PaintTitleBar(gfx::Canvas* canvas) {
   // The window icon is painted by the TabIconView.
   views::WindowDelegate* delegate = frame_->GetWindow()->GetDelegate();
   if (delegate == NULL) {
-    LOG(INFO) << "delegate is NULL";
+    LOG(WARNING) << "delegate is NULL";
     return;
   }
   if (delegate->ShouldShowWindowTitle()) {
     canvas->DrawStringInt(delegate->GetWindowTitle(),
                           BrowserFrame::GetTitleFont(),
         SK_ColorWHITE, MirroredLeftPointForRect(title_bounds_),
         title_bounds_.y(), title_bounds_.width(), title_bounds_.height());
     /* TODO(pkasting):  If this window is active, we should also draw a drop
      * shadow on the title.  This is tricky, because we don't want to hardcode a
      * shadow color (since we want to work with various themes), but we can't
@@ skipping 293 matching lines @@
       visible_button->x() - minimize_button_size.width(), caption_y,
       minimize_button_size.width(),
       minimize_button_size.height());
 }
 
 void OpaqueBrowserFrameView::LayoutTitleBar() {
   // The window title is based on the calculated icon position, even when there
   // is no icon.
   gfx::Rect icon_bounds(IconBounds());
   views::WindowDelegate* delegate = frame_->GetWindow()->GetDelegate();
-  if (delegate == NULL) {
-    LOG(INFO) << "delegate is NULL";
-    return;
-  }
-  if (delegate->ShouldShowWindowIcon())
+  if (delegate && delegate->ShouldShowWindowIcon())
     window_icon_->SetBounds(icon_bounds);
 
   // Size the title, if visible.
-  if (delegate->ShouldShowWindowTitle()) {
+  if (delegate && delegate->ShouldShowWindowTitle()) {
     int title_x = delegate->ShouldShowWindowIcon() ?
         icon_bounds.right() + kIconTitleSpacing : icon_bounds.x();
     int title_height = BrowserFrame::GetTitleFont().GetHeight();
     // We bias the title position so that when the difference between the icon
     // and title heights is odd, the extra pixel of the title is above the
     // vertical midline rather than below.  This compensates for how the icon is
     // already biased downwards (see IconBounds()) and helps prevent descenders
     // on the title from overlapping the 3D edge at the bottom of the titlebar.
     title_bounds_.SetRect(title_x,
         icon_bounds.y() + ((icon_bounds.height() - title_height - 1) / 2),
@@ skipping 22 matching lines @@
 }
 
 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
                                                             int height) const {
   int top_height = NonClientTopBorderHeight(false, false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - top_height - border_thickness));
 }