Refactor themePatternPhase and tab_view in preparation for fixing crbug.com/176857

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 1642 matching lines @@
     style |= THEMED_INCOGNITO;
 
   if (browser_->is_devtools())
     style |= THEMED_DEVTOOLS;
   if (browser_->is_type_popup())
     style |= THEMED_POPUP;
 
   return style;
 }
 
-- (NSPoint)themePatternPhase {
+- (NSPoint)themePatternPhaseForAlignment:(ThemePatternAlignment)alignment {
   NSView* windowChromeView = [[[self window] contentView] superview];
+  NSView* tabStripView = nil;
+  if (alignment == THEME_PATTERN_ALIGN_WITH_TAB_STRIP && [self hasTabStrip])
+    tabStripView = [self tabStripView];
   return [BrowserWindowUtils themePatternPhaseFor:windowChromeView
-                                     withTabStrip:[self tabStripView]];
+                                     withTabStrip:tabStripView];
 }
 
 - (NSPoint)bookmarkBubblePoint {
   return [toolbarController_ bookmarkBubblePoint];
 }
 
 // Show the bookmark bubble (e.g. user just clicked on the STAR).
 - (void)showBookmarkBubbleForURL:(const GURL&)url
                alreadyBookmarked:(BOOL)alreadyMarked {
   if (!bookmarkBubbleController_) {
@@ skipping 584 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)