[Mac] Touch Bar support for default browser window state

chrome/browser/ui/cocoa/framed_browser_window.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 
 #include <math.h>
 #include <objc/runtime.h>
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
+#import "chrome/browser/ui/cocoa/browser_window_touch_bar.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #include "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/cocoa/nsgraphics_context_additions.h"
 #import "ui/base/cocoa/nsview_additions.h"
-#include "ui/base/material_design/material_design_controller.h"
+#import "ui/base/cocoa/touch_bar_forward_declarations.h"
 
 // Implementer's note: Moving the window controls is tricky. When altering the
 // code, ensure that:
 // - accessibility hit testing works
 // - the accessibility hierarchy is correct
 // - close/min in the background don't bring the window forward
 // - rollover effects work correctly
 
 // The NSLayoutConstraint class hierarchy only exists in the 10.11 SDK. When
 // targeting something lower, constraintEqualToAnchor:constant: needs to be
@@ skipping 455 matching lines @@
     [overlayImage drawAtPoint:NSMakePoint(position.x,
                                           position.y - overlaySize.height)
                      fromRect:imageFrame
                     operation:NSCompositeSourceOver
                      fraction:1.0];
   }
 
   return themed;
 }
 
+- (NSTouchBar*)makeTouchBar {
+  BrowserWindowController* bwc =
+      static_cast<BrowserWindowController*>([self windowController]);

[Robert Sesek, 2017/02/14 17:32:51]

Use ObjCCastStrict instead.

[spqchan, 2017/02/16 15:25:52]

Done.

+  return [[bwc browserWindowTouchBar] makeTouchBar];
+}
+
 - (NSColor*)titleColor {
   const ui::ThemeProvider* themeProvider = [self themeProvider];
   if (!themeProvider)
     return [NSColor windowFrameTextColor];
 
   ThemedWindowStyle windowStyle = [self themedWindowStyle];
   BOOL incognito = windowStyle & THEMED_INCOGNITO;
 
   if (incognito)
     return [NSColor whiteColor];
@@ skipping 12 matching lines @@
   [self childWindowsDidChange];
 }
 
 - (void)childWindowsDidChange {
   id delegate = [self delegate];
   if ([delegate respondsToSelector:@selector(childWindowsDidChange)])
     [delegate childWindowsDidChange];
 }
 
 @end