| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 content::WindowedNotificationObserver observer( | 214 content::WindowedNotificationObserver observer( |
| 215 content::NOTIFICATION_LOAD_STOP, | 215 content::NOTIFICATION_LOAD_STOP, |
| 216 content::Source<NavigationController>(&tab->GetController())); | 216 content::Source<NavigationController>(&tab->GetController())); |
| 217 interstitial_page->Proceed(); | 217 interstitial_page->Proceed(); |
| 218 observer.Wait(); | 218 observer.Wait(); |
| 219 } | 219 } |
| 220 | 220 |
| 221 bool IsShowingWebContentsModalDialog() const { | 221 bool IsShowingWebContentsModalDialog() const { |
| 222 return WebContentsModalDialogManager::FromWebContents( | 222 return WebContentsModalDialogManager::FromWebContents( |
| 223 browser()->tab_strip_model()->GetActiveWebContents())-> | 223 browser()->tab_strip_model()->GetActiveWebContents())-> |
| 224 IsShowingDialog(); | 224 IsDialogActive(); |
| 225 } | 225 } |
| 226 | 226 |
| 227 static bool GetFilePathWithHostAndPortReplacement( | 227 static bool GetFilePathWithHostAndPortReplacement( |
| 228 const std::string& original_file_path, | 228 const std::string& original_file_path, |
| 229 const net::HostPortPair& host_port_pair, | 229 const net::HostPortPair& host_port_pair, |
| 230 std::string* replacement_path) { | 230 std::string* replacement_path) { |
| 231 std::vector<net::SpawnedTestServer::StringPair> replacement_text; | 231 std::vector<net::SpawnedTestServer::StringPair> replacement_text; |
| 232 replacement_text.push_back( | 232 replacement_text.push_back( |
| 233 make_pair("REPLACE_WITH_HOST_AND_PORT", host_port_pair.ToString())); | 233 make_pair("REPLACE_WITH_HOST_AND_PORT", host_port_pair.ToString())); |
| 234 return net::SpawnedTestServer::GetFilePathWithReplacements( | 234 return net::SpawnedTestServer::GetFilePathWithReplacements( |
| (...skipping 1408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1643 | 1643 |
| 1644 // Visit a page over https that contains a frame with a redirect. | 1644 // Visit a page over https that contains a frame with a redirect. |
| 1645 | 1645 |
| 1646 // XMLHttpRequest insecure content in synchronous mode. | 1646 // XMLHttpRequest insecure content in synchronous mode. |
| 1647 | 1647 |
| 1648 // XMLHttpRequest insecure content in asynchronous mode. | 1648 // XMLHttpRequest insecure content in asynchronous mode. |
| 1649 | 1649 |
| 1650 // XMLHttpRequest over bad ssl in synchronous mode. | 1650 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1651 | 1651 |
| 1652 // XMLHttpRequest over OK ssl in synchronous mode. | 1652 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |