![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS |6384240
* 6422872: Remove unused includes in isolation_info_mojom_traits.h |6422872
* chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files |6400733
* chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. |6431756
* 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate |6428345
* 6384315: Migrate extensions_enabled from ExtensionService to Registrar |6384315
* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. |6428749
* chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow |6440290
* 6429230: FSA: Move blocked paths to the PermissionContext class |6429230
* chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain |6443473
* fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() |6448510
* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow |6440290
* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() |6442265
* Provide dbus appmenu information on Wayland |6405535
* [extensions] Move OnExtensionInstalled out of ExtensionService. |6443325
* refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() |6404386
NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController |6420753
* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter |6429573
* chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual |6419936
* 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS |6394283
Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() |6459201
* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions |6454796
* chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs6428649
* feat: allow opt-out animated_content_sampler. Refs6438681
* Trigger CI --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
421 lines
14 KiB
Text
421 lines
14 KiB
Text
// Copyright (c) 2018 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/cocoa/electron_ns_window.h"
|
|
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "electron/mas.h"
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
|
#include "shell/browser/native_window_mac.h"
|
|
#include "shell/browser/ui/cocoa/electron_preview_item.h"
|
|
#include "shell/browser/ui/cocoa/electron_touch_bar.h"
|
|
#include "shell/browser/ui/cocoa/root_view_mac.h"
|
|
#include "ui/base/cocoa/window_size_constants.h"
|
|
|
|
#import <objc/message.h>
|
|
#import <objc/runtime.h>
|
|
|
|
using namespace std::string_view_literals;
|
|
|
|
namespace electron {
|
|
|
|
int ScopedDisableResize::disable_resize_ = 0;
|
|
|
|
} // namespace electron
|
|
|
|
@interface NSWindow (PrivateAPI)
|
|
- (NSImage*)_cornerMask;
|
|
- (int64_t)_resizeDirectionForMouseLocation:(CGPoint)location;
|
|
@end
|
|
|
|
// See components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
|
@interface NSView (CRFrameViewAdditions)
|
|
- (void)cr_mouseDownOnFrameView:(NSEvent*)event;
|
|
@end
|
|
|
|
typedef void (*MouseDownImpl)(id, SEL, NSEvent*);
|
|
|
|
namespace {
|
|
MouseDownImpl g_nsthemeframe_mousedown;
|
|
MouseDownImpl g_nsnextstepframe_mousedown;
|
|
} // namespace
|
|
|
|
// This class is never instantiated, it's just a container for our swizzled
|
|
// mouseDown method.
|
|
@interface SwizzledMethodsClass : NSView
|
|
@end
|
|
|
|
@implementation SwizzledMethodsClass
|
|
- (void)swiz_nsthemeframe_mouseDown:(NSEvent*)event {
|
|
if ([self.window respondsToSelector:@selector(shell)]) {
|
|
electron::NativeWindowMac* shell =
|
|
(electron::NativeWindowMac*)[(id)self.window shell];
|
|
if (shell && !shell->has_frame())
|
|
[self cr_mouseDownOnFrameView:event];
|
|
g_nsthemeframe_mousedown(self, @selector(mouseDown:), event);
|
|
}
|
|
}
|
|
|
|
- (void)swiz_nsnextstepframe_mouseDown:(NSEvent*)event {
|
|
if ([self.window respondsToSelector:@selector(shell)]) {
|
|
electron::NativeWindowMac* shell =
|
|
(electron::NativeWindowMac*)[(id)self.window shell];
|
|
if (shell && !shell->has_frame()) {
|
|
[self cr_mouseDownOnFrameView:event];
|
|
}
|
|
g_nsnextstepframe_mousedown(self, @selector(mouseDown:), event);
|
|
}
|
|
}
|
|
|
|
- (void)swiz_nsview_swipeWithEvent:(NSEvent*)event {
|
|
if ([self.window respondsToSelector:@selector(shell)]) {
|
|
electron::NativeWindowMac* shell =
|
|
(electron::NativeWindowMac*)[(id)self.window shell];
|
|
if (shell) {
|
|
if (event.deltaY == 1.0) {
|
|
shell->NotifyWindowSwipe("up");
|
|
} else if (event.deltaX == -1.0) {
|
|
shell->NotifyWindowSwipe("right");
|
|
} else if (event.deltaY == -1.0) {
|
|
shell->NotifyWindowSwipe("down");
|
|
} else if (event.deltaX == 1.0) {
|
|
shell->NotifyWindowSwipe("left");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@end
|
|
|
|
namespace {
|
|
#if IS_MAS_BUILD()
|
|
void SwizzleMouseDown(NSView* frame_view,
|
|
SEL swiz_selector,
|
|
MouseDownImpl* orig_impl) {
|
|
Method original_mousedown =
|
|
class_getInstanceMethod([frame_view class], @selector(mouseDown:));
|
|
*orig_impl = (MouseDownImpl)method_getImplementation(original_mousedown);
|
|
Method new_mousedown =
|
|
class_getInstanceMethod([SwizzledMethodsClass class], swiz_selector);
|
|
method_setImplementation(original_mousedown,
|
|
method_getImplementation(new_mousedown));
|
|
}
|
|
#else
|
|
// components/remote_cocoa/app_shim/bridged_content_view.h overrides
|
|
// swipeWithEvent, so we can't just override the implementation
|
|
// in ElectronNSWindow like we do with for ex. rotateWithEvent.
|
|
void SwizzleSwipeWithEvent(NSView* view, SEL swiz_selector) {
|
|
Method original_swipe_with_event =
|
|
class_getInstanceMethod([view class], @selector(swipeWithEvent:));
|
|
Method new_swipe_with_event =
|
|
class_getInstanceMethod([SwizzledMethodsClass class], swiz_selector);
|
|
method_setImplementation(original_swipe_with_event,
|
|
method_getImplementation(new_swipe_with_event));
|
|
}
|
|
#endif
|
|
|
|
} // namespace
|
|
|
|
@implementation ElectronNSWindow
|
|
|
|
@synthesize acceptsFirstMouse;
|
|
@synthesize enableLargerThanScreen;
|
|
@synthesize disableAutoHideCursor;
|
|
@synthesize disableKeyOrMainWindow;
|
|
@synthesize vibrantView;
|
|
@synthesize cornerMask;
|
|
|
|
- (id)initWithShell:(electron::NativeWindowMac*)shell
|
|
styleMask:(NSUInteger)styleMask {
|
|
if ((self = [super initWithContentRect:ui::kWindowSizeDeterminedLater
|
|
styleMask:styleMask
|
|
backing:NSBackingStoreBuffered
|
|
defer:NO])) {
|
|
#if IS_MAS_BUILD()
|
|
// The first time we create a frameless window, we swizzle the
|
|
// implementation of -[NSNextStepFrame mouseDown:], replacing it with our
|
|
// own.
|
|
// This is only necessary on MAS where we can't directly refer to
|
|
// NSNextStepFrame or NSThemeFrame, as they are private APIs.
|
|
// See components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm for
|
|
// the non-MAS-compatible way of doing this.
|
|
if (styleMask & NSWindowStyleMaskTitled) {
|
|
if (!g_nsthemeframe_mousedown) {
|
|
NSView* theme_frame = [[self contentView] superview];
|
|
DCHECK_EQ("NSThemeFrame"sv, class_getName([theme_frame class]));
|
|
SwizzleMouseDown(theme_frame, @selector(swiz_nsthemeframe_mouseDown:),
|
|
&g_nsthemeframe_mousedown);
|
|
}
|
|
} else {
|
|
if (!g_nsnextstepframe_mousedown) {
|
|
NSView* nextstep_frame = [[self contentView] superview];
|
|
DCHECK_EQ("NSNextStepFrame"sv, class_getName([nextstep_frame class]));
|
|
SwizzleMouseDown(nextstep_frame,
|
|
@selector(swiz_nsnextstepframe_mouseDown:),
|
|
&g_nsnextstepframe_mousedown);
|
|
}
|
|
}
|
|
#else
|
|
NSView* view = [[self contentView] superview];
|
|
SwizzleSwipeWithEvent(view, @selector(swiz_nsview_swipeWithEvent:));
|
|
#endif // IS_MAS_BUILD
|
|
shell_ = shell;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)cleanup {
|
|
shell_ = nullptr;
|
|
}
|
|
|
|
- (electron::NativeWindowMac*)shell {
|
|
return shell_;
|
|
}
|
|
|
|
- (id)accessibilityFocusedUIElement {
|
|
views::Widget* widget = shell_->widget();
|
|
id superFocus = [super accessibilityFocusedUIElement];
|
|
if (!widget || shell_->IsFocused())
|
|
return superFocus;
|
|
return nil;
|
|
}
|
|
- (NSRect)originalContentRectForFrameRect:(NSRect)frameRect {
|
|
return [super contentRectForFrameRect:frameRect];
|
|
}
|
|
|
|
- (NSTouchBar*)makeTouchBar {
|
|
if (shell_->touch_bar())
|
|
return [shell_->touch_bar() makeTouchBar];
|
|
else
|
|
return nil;
|
|
}
|
|
|
|
// NSWindow overrides.
|
|
|
|
- (void)sendEvent:(NSEvent*)event {
|
|
// Draggable regions only respond to left-click dragging, but the system will
|
|
// still suppress right-clicks in a draggable region. Temporarily disabling
|
|
// draggable regions allows the underlying views to respond to right-click
|
|
// to potentially bring up a frame context menu.
|
|
BOOL shouldDisableDraggable =
|
|
(event.type == NSEventTypeRightMouseDown ||
|
|
(event.type == NSEventTypeLeftMouseDown &&
|
|
([event modifierFlags] & NSEventModifierFlagControl)));
|
|
|
|
if (shouldDisableDraggable) {
|
|
electron::api::WebContents::SetDisableDraggableRegions(true);
|
|
}
|
|
|
|
[super sendEvent:event];
|
|
|
|
if (shouldDisableDraggable) {
|
|
electron::api::WebContents::SetDisableDraggableRegions(false);
|
|
}
|
|
}
|
|
|
|
- (void)rotateWithEvent:(NSEvent*)event {
|
|
shell_->NotifyWindowRotateGesture(event.rotation);
|
|
}
|
|
|
|
- (NSRect)contentRectForFrameRect:(NSRect)frameRect {
|
|
if (shell_->has_frame())
|
|
return [super contentRectForFrameRect:frameRect];
|
|
else
|
|
return frameRect;
|
|
}
|
|
|
|
- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen*)screen {
|
|
// Resizing is disabled.
|
|
if (electron::ScopedDisableResize::IsResizeDisabled())
|
|
return [self frame];
|
|
|
|
NSRect result = [super constrainFrameRect:frameRect toScreen:screen];
|
|
// Enable the window to be larger than screen.
|
|
if ([self enableLargerThanScreen]) {
|
|
// If we have a frame, ensure that we only position the window
|
|
// somewhere where the user can move or resize it (and not
|
|
// behind the menu bar, for instance)
|
|
//
|
|
// If there's no frame, put the window wherever the developer
|
|
// wanted it to go
|
|
if (shell_->has_frame()) {
|
|
result.size = frameRect.size;
|
|
} else {
|
|
result = frameRect;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
- (void)setFrame:(NSRect)windowFrame display:(BOOL)displayViews {
|
|
// constrainFrameRect is not called on hidden windows so disable adjusting
|
|
// the frame directly when resize is disabled
|
|
if (!electron::ScopedDisableResize::IsResizeDisabled())
|
|
[super setFrame:windowFrame display:displayViews];
|
|
}
|
|
|
|
- (void)orderWindow:(NSWindowOrderingMode)place relativeTo:(NSInteger)otherWin {
|
|
[self disableHeadlessMode];
|
|
[super orderWindow:place relativeTo:otherWin];
|
|
}
|
|
|
|
- (id)accessibilityAttributeValue:(NSString*)attribute {
|
|
if ([attribute isEqual:NSAccessibilityEnabledAttribute])
|
|
return [NSNumber numberWithBool:YES];
|
|
if (![attribute isEqualToString:@"AXChildren"])
|
|
return [super accessibilityAttributeValue:attribute];
|
|
|
|
// We want to remove the window title (also known as
|
|
// NSAccessibilityReparentingCellProxy), which VoiceOver already sees.
|
|
// * when VoiceOver is disabled, this causes Cmd+C to be used for TTS but
|
|
// still leaves the buttons available in the accessibility tree.
|
|
// * when VoiceOver is enabled, the full accessibility tree is used.
|
|
// Without removing the title and with VO disabled, the TTS would always read
|
|
// the window title instead of using Cmd+C to get the selected text.
|
|
NSPredicate* predicate =
|
|
[NSPredicate predicateWithFormat:@"(self.className != %@)",
|
|
@"NSAccessibilityReparentingCellProxy"];
|
|
|
|
NSArray* children = [super accessibilityAttributeValue:attribute];
|
|
NSMutableArray* mutableChildren = [children mutableCopy];
|
|
[mutableChildren filterUsingPredicate:predicate];
|
|
|
|
return mutableChildren;
|
|
}
|
|
|
|
- (NSString*)accessibilityTitle {
|
|
return base::SysUTF8ToNSString(shell_->GetTitle());
|
|
}
|
|
|
|
- (BOOL)canBecomeMainWindow {
|
|
return !self.disableKeyOrMainWindow;
|
|
}
|
|
|
|
- (BOOL)canBecomeKeyWindow {
|
|
return !self.disableKeyOrMainWindow;
|
|
}
|
|
|
|
- (NSView*)frameView {
|
|
return [[self contentView] superview];
|
|
}
|
|
|
|
- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
|
|
// By default "Close Window" is always disabled when window has no title, to
|
|
// support closing a window without title we need to manually do menu item
|
|
// validation. This code path is used by the "roundedCorners" option.
|
|
if ([item action] == @selector(performClose:))
|
|
return shell_->IsClosable();
|
|
return [super validateUserInterfaceItem:item];
|
|
}
|
|
|
|
// By overriding this built-in method the corners of the vibrant view (if set)
|
|
// will be smooth.
|
|
- (NSImage*)_cornerMask {
|
|
if (self.vibrantView != nil) {
|
|
return [self cornerMask];
|
|
} else {
|
|
return [super _cornerMask];
|
|
}
|
|
}
|
|
|
|
- (void)disableHeadlessMode {
|
|
if (shell_) {
|
|
// We initialize the window in headless mode to allow painting before it is
|
|
// shown, but we don't want the headless behavior of allowing the window to
|
|
// be placed unconstrained.
|
|
self.isHeadless = false;
|
|
shell_->widget()->DisableHeadlessMode();
|
|
}
|
|
}
|
|
|
|
// Quicklook methods
|
|
|
|
- (BOOL)acceptsPreviewPanelControl:(QLPreviewPanel*)panel {
|
|
return YES;
|
|
}
|
|
|
|
- (void)beginPreviewPanelControl:(QLPreviewPanel*)panel {
|
|
panel.dataSource = static_cast<id<QLPreviewPanelDataSource>>([self delegate]);
|
|
}
|
|
|
|
- (void)endPreviewPanelControl:(QLPreviewPanel*)panel {
|
|
panel.dataSource = nil;
|
|
}
|
|
|
|
// Custom window button methods
|
|
|
|
- (BOOL)windowShouldClose:(id)sender {
|
|
return YES;
|
|
}
|
|
|
|
- (void)performClose:(id)sender {
|
|
if (shell_->title_bar_style() ==
|
|
electron::NativeWindowMac::TitleBarStyle::kCustomButtonsOnHover) {
|
|
[[self delegate] windowShouldClose:self];
|
|
} else if (!([self styleMask] & NSWindowStyleMaskTitled)) {
|
|
// performClose does not work for windows without title, so we have to
|
|
// emulate its behavior. This code path is used by "simpleFullscreen" and
|
|
// "roundedCorners" options.
|
|
if ([[self delegate] respondsToSelector:@selector(windowShouldClose:)]) {
|
|
if (![[self delegate] windowShouldClose:self])
|
|
return;
|
|
} else if ([self respondsToSelector:@selector(windowShouldClose:)]) {
|
|
if (![self windowShouldClose:self])
|
|
return;
|
|
}
|
|
[self close];
|
|
} else if (shell_->is_modal() && shell_->parent() && shell_->IsVisible()) {
|
|
// We don't want to actually call [window close] here since
|
|
// we've already called endSheet on the modal sheet.
|
|
return;
|
|
} else {
|
|
[super performClose:sender];
|
|
}
|
|
}
|
|
|
|
- (BOOL)toggleFullScreenMode:(id)sender {
|
|
if (!shell_->has_frame() && !shell_->HasStyleMask(NSWindowStyleMaskTitled))
|
|
return NO;
|
|
|
|
bool is_simple_fs = shell_->IsSimpleFullScreen();
|
|
bool always_simple_fs = shell_->always_simple_fullscreen();
|
|
|
|
// If we're in simple fullscreen mode and trying to exit it
|
|
// we need to ensure we exit it properly to prevent a crash
|
|
// with NSWindowStyleMaskTitled mode.
|
|
if (is_simple_fs || always_simple_fs) {
|
|
shell_->SetSimpleFullScreen(!is_simple_fs);
|
|
} else {
|
|
if (shell_->IsVisible()) {
|
|
// Until 10.13, AppKit would obey a call to -toggleFullScreen: made inside
|
|
// windowDidEnterFullScreen & windowDidExitFullScreen. Starting in 10.13,
|
|
// it behaves as though the transition is still in progress and just emits
|
|
// "not in a fullscreen state" when trying to exit fullscreen in the same
|
|
// runloop that entered it. To handle this, invoke -toggleFullScreen:
|
|
// asynchronously.
|
|
[super performSelector:@selector(toggleFullScreen:)
|
|
withObject:nil
|
|
afterDelay:0];
|
|
} else {
|
|
[super toggleFullScreen:sender];
|
|
}
|
|
|
|
// Exiting fullscreen causes Cocoa to redraw the NSWindow, which resets
|
|
// the enabled state for NSWindowZoomButton. We need to persist it.
|
|
bool maximizable = shell_->IsMaximizable();
|
|
shell_->SetMaximizable(maximizable);
|
|
}
|
|
|
|
return YES;
|
|
}
|
|
|
|
- (void)performMiniaturize:(id)sender {
|
|
if (shell_->title_bar_style() ==
|
|
electron::NativeWindowMac::TitleBarStyle::kCustomButtonsOnHover)
|
|
[self miniaturize:self];
|
|
else
|
|
[super performMiniaturize:sender];
|
|
}
|
|
|
|
@end
|