Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: ui/views/cocoa/bridged_content_view_touch_bar.mm

Issue 2530633002: Revert of [Mac] Switch from NSObject categories to forward declarations for Touch Bar support. (pat… (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/cocoa/touch_bar_forward_declarations.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/cocoa/bridged_content_view_touch_bar.mm
diff --git a/ui/views/cocoa/bridged_content_view_touch_bar.mm b/ui/views/cocoa/bridged_content_view_touch_bar.mm
index 2f1d81dfc172ef78525acd4c73d8acb2721351cd..109f4cdafa8fd930869e60f12e3e8038bfd22aa7 100644
--- a/ui/views/cocoa/bridged_content_view_touch_bar.mm
+++ b/ui/views/cocoa/bridged_content_view_touch_bar.mm
@@ -48,8 +48,7 @@ NSString* const kTouchBarCancelId = @"com.google.chrome-CANCEL";
// NSTouchBarDelegate protocol implementation.
- (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
- makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
- NS_AVAILABLE_MAC(10_12_1) {
+ makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier {
if (!hostedView_)
return nil;
@@ -62,9 +61,7 @@ NSString* const kTouchBarCancelId = @"com.google.chrome-CANCEL";
}
if ([items count] == 0)
return nil;
- return [NSClassFromString(@"NSGroupTouchBarItem")
- groupItemWithIdentifier:identifier
- items:items];
+ return [NSGroupTouchBarItem groupItemWithIdentifier:identifier items:items];
}
ui::DialogButton type = ui::DIALOG_BUTTON_NONE;
@@ -104,7 +101,7 @@ NSString* const kTouchBarCancelId = @"com.google.chrome-CANCEL";
// NSTouchBarProvider protocol implementation (via NSResponder category).
-- (NSTouchBar*)makeTouchBar NS_AVAILABLE_MAC(10_12_1) {
+- (NSTouchBar*)makeTouchBar {
if (!hostedView_)
return nil;
« no previous file with comments | « ui/base/cocoa/touch_bar_forward_declarations.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698