OLD | NEW |
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_manager.h" | 5 #include "content/shell/browser/shell_javascript_dialog_manager.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
11 #include "content/public/browser/web_contents_view.h" | 11 #include "content/public/browser/web_contents_view.h" |
| 12 #include "content/shell/browser/shell_javascript_dialog.h" |
| 13 #include "content/shell/browser/webkit_test_controller.h" |
12 #include "content/shell/common/shell_switches.h" | 14 #include "content/shell/common/shell_switches.h" |
13 #include "content/shell/shell_javascript_dialog.h" | |
14 #include "content/shell/webkit_test_controller.h" | |
15 #include "net/base/net_util.h" | 15 #include "net/base/net_util.h" |
16 | 16 |
17 namespace content { | 17 namespace content { |
18 | 18 |
19 ShellJavaScriptDialogManager::ShellJavaScriptDialogManager() { | 19 ShellJavaScriptDialogManager::ShellJavaScriptDialogManager() { |
20 } | 20 } |
21 | 21 |
22 ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() { | 22 ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() { |
23 } | 23 } |
24 | 24 |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) { | 134 void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) { |
135 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK) | 135 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK) |
136 DCHECK_EQ(dialog, dialog_.get()); | 136 DCHECK_EQ(dialog, dialog_.get()); |
137 dialog_.reset(); | 137 dialog_.reset(); |
138 #else | 138 #else |
139 // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if | 139 // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if |
140 #endif | 140 #endif |
141 } | 141 } |
142 | 142 |
143 } // namespace content | 143 } // namespace content |
OLD | NEW |