OpaqueBrowserFrameViewPlatformSpecific::Create no longer returns NULL.

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

 // Copyright (c) 2012 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/ui/views/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 410 matching lines @@
       NOTREACHED() << "Got a notification we didn't register for!";
       break;
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, OpaqueBrowserFrameViewLayoutDelegate implementation:
 
 bool OpaqueBrowserFrameView::ShouldShowWindowIcon() const {
   views::WidgetDelegate* delegate = frame()->widget_delegate();
-  // ShouldShowTitleBar defaults to true.
-  if (platform_observer_ && !platform_observer_->ShouldShowTitleBar())
-    return false;
-  return delegate && delegate->ShouldShowWindowIcon();
+  DCHECK(platform_observer_);

[James Cook, 2014/01/06 17:54:12]

nit: I don't think you need to DCHECK these pointers, since the fact that you
immediately dereference them tells the reader you don't expect them to ever be
NULL.

[Matt Giuca, 2014/01/06 23:51:40]

Done.

+  return platform_observer_->ShouldShowTitleBar() && delegate &&
+         delegate->ShouldShowWindowIcon();
 }
 
 bool OpaqueBrowserFrameView::ShouldShowWindowTitle() const {
   // |delegate| may be NULL if called from callback of InputMethodChanged while
   // a window is being destroyed.
   // See more discussion at http://crosbug.com/8958
   views::WidgetDelegate* delegate = frame()->widget_delegate();
-  // ShouldShowTitleBar defaults to true.
-  if (platform_observer_ && !platform_observer_->ShouldShowTitleBar())
-    return false;
-  return delegate && delegate->ShouldShowWindowTitle();
+  DCHECK(platform_observer_);
+  return platform_observer_->ShouldShowTitleBar() && delegate &&
+         delegate->ShouldShowWindowTitle();
 }
 
 base::string16 OpaqueBrowserFrameView::GetWindowTitle() const {
   return frame()->widget_delegate()->GetWindowTitle();
 }
 
 int OpaqueBrowserFrameView::GetIconSize() const {
 #if defined(OS_WIN)
   // This metric scales up if either the titlebar height or the titlebar font
   // size are increased.
   return GetSystemMetrics(SM_CYSMICON);
 #else
   return std::max(BrowserFrame::GetTitleFont().GetHeight(), kIconMinimumSize);
 #endif
 }
 
 bool OpaqueBrowserFrameView::ShouldLeaveOffsetNearTopBorder() const {
   return frame()->ShouldLeaveOffsetNearTopBorder();
 }
 
 gfx::Size OpaqueBrowserFrameView::GetBrowserViewMinimumSize() const {
   return browser_view()->GetMinimumSize();
 }
 
 bool OpaqueBrowserFrameView::ShouldShowCaptionButtons() const {
   if (!OpaqueBrowserFrameViewLayout::ShouldAddDefaultCaptionButtons())
     return false;
-  if (!platform_observer_)
-    return true;
+  DCHECK(platform_observer_);
   return platform_observer_->ShouldShowCaptionButtons();
 }
 
 bool OpaqueBrowserFrameView::ShouldShowAvatar() const {
   return browser_view()->ShouldShowAvatar();
 }
 
 bool OpaqueBrowserFrameView::IsRegularOrGuestSession() const {
   return browser_view()->IsRegularOrGuestSession();
 }
@@ skipping 415 matching lines @@
 
 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
   gfx::ImageSkia* frame_image = GetFrameImage();
   int top_area_height = frame_image->height();
   if (browser_view()->IsTabStripVisible()) {
     top_area_height = std::max(top_area_height,
       GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
   }
   return top_area_height;
 }