[Mac] Touch Bar support for default browser window state

chrome/browser/ui/cocoa/browser_window_controller.mm

Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 9af374e6fbd853e6737c09108988f14395f940e8..a2b6594833335be49946d4b7811d0cce510e157d 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -48,6 +48,7 @@
 #import "chrome/browser/ui/cocoa/browser_window_command_handler.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.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"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
@@ -96,6 +97,7 @@
 #include "content/public/browser/web_contents.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
+#import "ui/base/cocoa/touch_bar_forward_declarations.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/display/screen.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
@@ -1003,6 +1005,12 @@ bool IsTabDetachingInFullscreenEnabled() {
 
 - (void)setStarredState:(BOOL)isStarred {
   [toolbarController_ setStarredState:isStarred];
+
+  if (touchBar_) {

[Robert Sesek, 2017/02/16 18:19:39]

Omit the nil checks. Messaging nil is fine.

[spqchan, 2017/02/16 18:35:42]

Done.

+    [touchBar_ setIsStarred:isStarred];
+    if ([[self window] respondsToSelector:@selector(setTouchBar:)])
+      [[self window] performSelector:@selector(setTouchBar:) withObject:nil];
+  }
 }
 
 - (void)setCurrentPageIsTranslated:(BOOL)on {
@@ -1144,6 +1152,11 @@ bool IsTabDetachingInFullscreenEnabled() {
 
 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force {
   [toolbarController_ setIsLoading:isLoading force:force];
+  if (touchBar_) {
+    [touchBar_ setIsPageLoading:isLoading];
+    if ([[self window] respondsToSelector:@selector(setTouchBar:)])
+      [[self window] performSelector:@selector(setTouchBar:) withObject:nil];
+  }
 }
 
 // Make the location bar the first responder, if possible.
@@ -1850,6 +1863,15 @@ willAnimateFromState:(BookmarkBar::State)oldState
   return static_cast<BrowserWindowCocoa*>([self browserWindow])->alert_state();
 }
 
+- (BrowserWindowTouchBar*)browserWindowTouchBar {
+  if (!touchBar_) {
+    touchBar_.reset(
+        [[BrowserWindowTouchBar alloc] initWithBrowser:browser_.get()]);
+  }
+
+  return touchBar_.get();
+}
+
 @end  // @implementation BrowserWindowController
 
 @implementation BrowserWindowController(Fullscreen)