Index: chrome/browser/ui/cocoa/framed_browser_window.mm |
diff --git a/chrome/browser/ui/cocoa/framed_browser_window.mm b/chrome/browser/ui/cocoa/framed_browser_window.mm |
index 65e14a23e2979575da4ec570af4bf26dacbcaae7..0dc73a7ff010b866d6d4087647e377a6dc87f571 100644 |
--- a/chrome/browser/ui/cocoa/framed_browser_window.mm |
+++ b/chrome/browser/ui/cocoa/framed_browser_window.mm |
@@ -16,6 +16,7 @@ |
#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" |
@@ -24,7 +25,7 @@ |
#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: |
@@ -500,6 +501,12 @@ const CGFloat kWindowGradientHeight = 24.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) |