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

Side by Side Diff: content/shell/browser/shell_javascript_dialog_manager.h

Issue 629143003: Replace OVERRIDE and FINAL with override and final in content/shell/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
6 #define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ 6 #define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
7 7
8 #include "base/callback_forward.h" 8 #include "base/callback_forward.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 10 matching lines...) Expand all
21 21
22 // JavaScriptDialogManager: 22 // JavaScriptDialogManager:
23 virtual void RunJavaScriptDialog( 23 virtual void RunJavaScriptDialog(
24 WebContents* web_contents, 24 WebContents* web_contents,
25 const GURL& origin_url, 25 const GURL& origin_url,
26 const std::string& accept_lang, 26 const std::string& accept_lang,
27 JavaScriptMessageType javascript_message_type, 27 JavaScriptMessageType javascript_message_type,
28 const base::string16& message_text, 28 const base::string16& message_text,
29 const base::string16& default_prompt_text, 29 const base::string16& default_prompt_text,
30 const DialogClosedCallback& callback, 30 const DialogClosedCallback& callback,
31 bool* did_suppress_message) OVERRIDE; 31 bool* did_suppress_message) override;
32 32
33 virtual void RunBeforeUnloadDialog( 33 virtual void RunBeforeUnloadDialog(
34 WebContents* web_contents, 34 WebContents* web_contents,
35 const base::string16& message_text, 35 const base::string16& message_text,
36 bool is_reload, 36 bool is_reload,
37 const DialogClosedCallback& callback) OVERRIDE; 37 const DialogClosedCallback& callback) override;
38 38
39 virtual void CancelActiveAndPendingDialogs( 39 virtual void CancelActiveAndPendingDialogs(
40 WebContents* web_contents) OVERRIDE; 40 WebContents* web_contents) override;
41 41
42 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; 42 virtual void WebContentsDestroyed(WebContents* web_contents) override;
43 43
44 // Called by the ShellJavaScriptDialog when it closes. 44 // Called by the ShellJavaScriptDialog when it closes.
45 void DialogClosed(ShellJavaScriptDialog* dialog); 45 void DialogClosed(ShellJavaScriptDialog* dialog);
46 46
47 // Used for content_browsertests. 47 // Used for content_browsertests.
48 void set_dialog_request_callback(const base::Closure& callback) { 48 void set_dialog_request_callback(const base::Closure& callback) {
49 dialog_request_callback_ = callback; 49 dialog_request_callback_ = callback;
50 } 50 }
51 51
52 private: 52 private:
53 #if defined(OS_MACOSX) || defined(OS_WIN) 53 #if defined(OS_MACOSX) || defined(OS_WIN)
54 // The dialog being shown. No queueing. 54 // The dialog being shown. No queueing.
55 scoped_ptr<ShellJavaScriptDialog> dialog_; 55 scoped_ptr<ShellJavaScriptDialog> dialog_;
56 #else 56 #else
57 // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if 57 // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
58 #endif 58 #endif
59 59
60 base::Closure dialog_request_callback_; 60 base::Closure dialog_request_callback_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialogManager); 62 DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialogManager);
63 }; 63 };
64 64
65 } // namespace content 65 } // namespace content
66 66
67 #endif // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ 67 #endif // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
OLDNEW
« no previous file with comments | « content/shell/browser/shell_download_manager_delegate.h ('k') | content/shell/browser/shell_login_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698