Commit f2f798ac authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot

Make category names unique for interfaces (browser/ui)

When building using jumbo, interfaces and implementations
end up in the same scope. The interfaces with the same
category name conflicts.

This commit solves the issue by renaming the category to
something more file specific.

Bug: 803406
Change-Id: I21a6645640d40b0ed6cd1324dfc30efa87da23c0
Reviewed-on: https://chromium-review.googlesource.com/1140162Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#575624}
parent 7cd1d105
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
using extensions::AppWindow; using extensions::AppWindow;
@interface NSWindow (NSPrivateApis) @interface NSWindow (NSPrivateNativeAppWindowApis)
- (void)setBottomCornerRounded:(BOOL)rounded; - (void)setBottomCornerRounded:(BOOL)rounded;
- (BOOL)_isTitleHidden; - (BOOL)_isTitleHidden;
@end @end
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
using content::RenderWidgetHostView; using content::RenderWidgetHostView;
using content::WebContents; using content::WebContents;
@interface NSView (PrivateAPI) @interface NSView (PrivateBrowserWindowControllerAPI)
// Returns the fullscreen button's origin in window coordinates. This method is // Returns the fullscreen button's origin in window coordinates. This method is
// only available on NSThemeFrame (the contentView's superview), and it should // only available on NSThemeFrame (the contentView's superview), and it should
// not be relied on to exist on macOS >10.9 (which doesn't have a separate // not be relied on to exist on macOS >10.9 (which doesn't have a separate
...@@ -80,7 +80,7 @@ enum WindowLocation { ...@@ -80,7 +80,7 @@ enum WindowLocation {
} // namespace } // namespace
@interface NSWindow (NSPrivateApis) @interface NSWindow (NSPrivateBrowserWindowControllerApis)
// Note: These functions are private, use -[NSObject respondsToSelector:] // Note: These functions are private, use -[NSObject respondsToSelector:]
// before calling them. // before calling them.
- (NSWindow*)_windowForToolbar; - (NSWindow*)_windowForToolbar;
......
...@@ -36,7 +36,7 @@ WEAK_IMPORT_ATTRIBUTE ...@@ -36,7 +36,7 @@ WEAK_IMPORT_ATTRIBUTE
__attribute__((availability(macos, obsoleted = 10.10))); __attribute__((availability(macos, obsoleted = 10.10)));
@end @end
@interface NSWindow (PrivateAPI) @interface NSWindow (PrivateTabbedBrowserWindowAPI)
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle; + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
@end @end
...@@ -125,7 +125,7 @@ WEAK_IMPORT_ATTRIBUTE ...@@ -125,7 +125,7 @@ WEAK_IMPORT_ATTRIBUTE
return styleMask; return styleMask;
} }
// NSWindow (PrivateAPI) overrides. // NSWindow (PrivateTabbedBrowserWindowAPI) overrides.
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
// Because NSThemeFrame is imported weakly, if it's not present at runtime // Because NSThemeFrame is imported weakly, if it's not present at runtime
......
...@@ -150,7 +150,7 @@ NSRect FlipRectInView(NSView* view, NSRect rect) { ...@@ -150,7 +150,7 @@ NSRect FlipRectInView(NSView* view, NSRect rect) {
} // namespace } // namespace
@interface NSView (PrivateAPI) @interface NSView (PrivateTabStripControllerAPI)
// Called by AppKit to check if dragging this view should move the window. // Called by AppKit to check if dragging this view should move the window.
// NSButton overrides this method in the same way so dragging window buttons // NSButton overrides this method in the same way so dragging window buttons
// has no effect. NSView implementation returns NSZeroRect so the whole view // has no effect. NSView implementation returns NSZeroRect so the whole view
......
...@@ -60,7 +60,7 @@ const CGFloat kMouseHoverWhiteValueIncongito = 0.3; ...@@ -60,7 +60,7 @@ const CGFloat kMouseHoverWhiteValueIncongito = 0.3;
// has moved less than the threshold, we want to close the tab. // has moved less than the threshold, we want to close the tab.
const CGFloat kRapidCloseDist = 2.5; const CGFloat kRapidCloseDist = 2.5;
@interface NSView (PrivateAPI) @interface NSView (PrivateTabViewAPI)
// Called by AppKit to check if dragging this view should move the window. // Called by AppKit to check if dragging this view should move the window.
// NSButton overrides this method in the same way so dragging window buttons // NSButton overrides this method in the same way so dragging window buttons
// has no effect. NSView implementation returns NSZeroRect so the whole view // has no effect. NSView implementation returns NSZeroRect so the whole view
......
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
@interface NSWindow (PrivateAPI) @interface NSWindow (PrivateBrowserNativeWidgetAPI)
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle; + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
@end @end
@interface NSThemeFrame (PrivateAPI) @interface NSThemeFrame (PrivateBrowserNativeWidgetAPI)
- (CGFloat)_titlebarHeight; - (CGFloat)_titlebarHeight;
- (void)setStyleMask:(NSUInteger)styleMask; - (void)setStyleMask:(NSUInteger)styleMask;
@end @end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment