Commit 74ff22e5 authored by Joe Downing's avatar Joe Downing Committed by Commit Bot

[MacOS Host] Fixing a memory leak in the alert dialog

Follow-up CL fixing a leak identified post check-in.

Bug: 902041
Change-Id: I733cc6037f5c29f0decabae72d51a6470de17f91
Reviewed-on: https://chromium-review.googlesource.com/c/1355332Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612298}
parent 14276294
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/location.h" #include "base/location.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_refptr.h" #include "base/memory/scoped_refptr.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
...@@ -22,7 +23,7 @@ constexpr int kMinDialogWidthPx = 650; ...@@ -22,7 +23,7 @@ constexpr int kMinDialogWidthPx = 650;
constexpr NSString* kServiceScriptName = @"org.chromium.chromoting.me2me.sh"; constexpr NSString* kServiceScriptName = @"org.chromium.chromoting.me2me.sh";
void ShowPermissionDialog() { void ShowPermissionDialog() {
NSAlert* alert = [[NSAlert alloc] init]; base::scoped_nsobject<NSAlert> alert([[NSAlert alloc] init]);
[alert setMessageText:l10n_util::GetNSString( [alert setMessageText:l10n_util::GetNSString(
IDS_ACCESSIBILITY_PERMISSION_DIALOG_TITLE)]; IDS_ACCESSIBILITY_PERMISSION_DIALOG_TITLE)];
[alert setInformativeText: [alert setInformativeText:
...@@ -42,13 +43,14 @@ void ShowPermissionDialog() { ...@@ -42,13 +43,14 @@ void ShowPermissionDialog() {
// Increase the alert width so the title doesn't wrap and the body text is // Increase the alert width so the title doesn't wrap and the body text is
// less scrunched. Note that we only want to set a min-width, we don't // less scrunched. Note that we only want to set a min-width, we don't
// want to shrink the dialog if it is already larger than our min value. // want to shrink the dialog if it is already larger than our min value.
NSRect frame = [alert.window frame]; NSWindow* alert_window = [alert window];
NSRect frame = [alert_window frame];
if (frame.size.width < kMinDialogWidthPx) if (frame.size.width < kMinDialogWidthPx)
frame.size.width = kMinDialogWidthPx; frame.size.width = kMinDialogWidthPx;
[alert.window setFrame:frame display:YES]; [alert_window setFrame:frame display:YES];
[alert setAlertStyle:NSAlertStyleWarning]; [alert setAlertStyle:NSAlertStyleWarning];
[alert.window makeKeyWindow]; [alert_window makeKeyWindow];
if ([alert runModal] == NSAlertFirstButtonReturn) { if ([alert runModal] == NSAlertFirstButtonReturn) {
// Launch the Security and Preferences pane with Accessibility selected. // Launch the Security and Preferences pane with Accessibility selected.
[[NSWorkspace sharedWorkspace] [[NSWorkspace sharedWorkspace]
......
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