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

Side by Side Diff: content/shell/shell_javascript_dialog_mac.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/shell_javascript_dialog.h" 5 #include "content/shell/shell_javascript_dialog.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #import "base/memory/scoped_nsobject.h" 9 #import "base/mac/scoped_nsobject.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
11 #include "content/shell/shell_javascript_dialog_manager.h" 11 #include "content/shell/shell_javascript_dialog_manager.h"
12 12
13 // Helper object that receives the notification that the dialog/sheet is 13 // Helper object that receives the notification that the dialog/sheet is
14 // going away. Is responsible for cleaning itself up. 14 // going away. Is responsible for cleaning itself up.
15 @interface ShellJavaScriptDialogHelper : NSObject<NSAlertDelegate> { 15 @interface ShellJavaScriptDialogHelper : NSObject<NSAlertDelegate> {
16 @private 16 @private
17 scoped_nsobject<NSAlert> alert_; 17 base::scoped_nsobject<NSAlert> alert_;
18 NSTextField* textField_; // WEAK; owned by alert_ 18 NSTextField* textField_; // WEAK; owned by alert_
19 19
20 // Copies of the fields in ShellJavaScriptDialog because they're private. 20 // Copies of the fields in ShellJavaScriptDialog because they're private.
21 content::ShellJavaScriptDialogManager* manager_; 21 content::ShellJavaScriptDialogManager* manager_;
22 content::JavaScriptDialogManager::DialogClosedCallback callback_; 22 content::JavaScriptDialogManager::DialogClosedCallback callback_;
23 } 23 }
24 24
25 - (id)initHelperWithManager:(content::ShellJavaScriptDialogManager*)manager 25 - (id)initHelperWithManager:(content::ShellJavaScriptDialogManager*)manager
26 andCallback:(content::JavaScriptDialogManager::DialogClosedCallback)callback; 26 andCallback:(content::JavaScriptDialogManager::DialogClosedCallback)callback;
27 - (NSAlert*)alert; 27 - (NSAlert*)alert;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 ShellJavaScriptDialog::~ShellJavaScriptDialog() { 130 ShellJavaScriptDialog::~ShellJavaScriptDialog() {
131 [helper_ release]; 131 [helper_ release];
132 } 132 }
133 133
134 void ShellJavaScriptDialog::Cancel() { 134 void ShellJavaScriptDialog::Cancel() {
135 [helper_ cancel]; 135 [helper_ cancel];
136 } 136 }
137 137
138 } // namespace content 138 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698