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

Side by Side Diff: chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h

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 #ifndef CHROME_BROWSER_UI_COCOA_JAVASCRIPT_APP_MODAL_DIALOG_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_JAVASCRIPT_APP_MODAL_DIALOG_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_JAVASCRIPT_APP_MODAL_DIALOG_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_JAVASCRIPT_APP_MODAL_DIALOG_COCOA_H_
7 7
8 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" 8 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 13
14 #if __OBJC__ 14 #if __OBJC__
15 @class NSAlert; 15 @class NSAlert;
16 @class JavaScriptAppModalDialogHelper; 16 @class JavaScriptAppModalDialogHelper;
17 #else 17 #else
18 class NSAlert; 18 class NSAlert;
19 class JavaScriptAppModalDialogHelper; 19 class JavaScriptAppModalDialogHelper;
20 #endif 20 #endif
21 21
22 class JavaScriptAppModalDialogCocoa : public NativeAppModalDialog { 22 class JavaScriptAppModalDialogCocoa : public NativeAppModalDialog {
23 public: 23 public:
24 explicit JavaScriptAppModalDialogCocoa(JavaScriptAppModalDialog* dialog); 24 explicit JavaScriptAppModalDialogCocoa(JavaScriptAppModalDialog* dialog);
25 virtual ~JavaScriptAppModalDialogCocoa(); 25 virtual ~JavaScriptAppModalDialogCocoa();
26 26
27 // Overridden from NativeAppModalDialog: 27 // Overridden from NativeAppModalDialog:
28 virtual int GetAppModalDialogButtons() const OVERRIDE; 28 virtual int GetAppModalDialogButtons() const OVERRIDE;
29 virtual void ShowAppModalDialog() OVERRIDE; 29 virtual void ShowAppModalDialog() OVERRIDE;
30 virtual void ActivateAppModalDialog() OVERRIDE; 30 virtual void ActivateAppModalDialog() OVERRIDE;
31 virtual void CloseAppModalDialog() OVERRIDE; 31 virtual void CloseAppModalDialog() OVERRIDE;
32 virtual void AcceptAppModalDialog() OVERRIDE; 32 virtual void AcceptAppModalDialog() OVERRIDE;
33 virtual void CancelAppModalDialog() OVERRIDE; 33 virtual void CancelAppModalDialog() OVERRIDE;
34 34
35 JavaScriptAppModalDialog* dialog() const { return dialog_.get(); } 35 JavaScriptAppModalDialog* dialog() const { return dialog_.get(); }
36 36
37 private: 37 private:
38 scoped_ptr<JavaScriptAppModalDialog> dialog_; 38 scoped_ptr<JavaScriptAppModalDialog> dialog_;
39 39
40 scoped_nsobject<JavaScriptAppModalDialogHelper> helper_; 40 base::scoped_nsobject<JavaScriptAppModalDialogHelper> helper_;
41 NSAlert* alert_; // weak, owned by |helper_|. 41 NSAlert* alert_; // weak, owned by |helper_|.
42 42
43 DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialogCocoa); 43 DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialogCocoa);
44 }; 44 };
45 45
46 #endif // CHROME_BROWSER_UI_COCOA_JAVASCRIPT_APP_MODAL_DIALOG_COCOA_H_ 46 #endif // CHROME_BROWSER_UI_COCOA_JAVASCRIPT_APP_MODAL_DIALOG_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698