| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/web_contents.h" | 5 #include "chrome/browser/web_contents.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/file_version_info.h" | 9 #include "base/file_version_info.h" |
| 10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 // handler. It does this by asynchronously calling the OnCrossSiteResponse | 79 // handler. It does this by asynchronously calling the OnCrossSiteResponse |
| 80 // method of WebContents on the UI thread, which sends a ClosePage message | 80 // method of WebContents on the UI thread, which sends a ClosePage message |
| 81 // to the current RVH. | 81 // to the current RVH. |
| 82 // - Once the onunload handler is finished, a ClosePage_ACK message is sent to | 82 // - Once the onunload handler is finished, a ClosePage_ACK message is sent to |
| 83 // the ResourceDispatcherHost, who unpauses the response. Data is then sent | 83 // the ResourceDispatcherHost, who unpauses the response. Data is then sent |
| 84 // to the pending RVH. | 84 // to the pending RVH. |
| 85 // - The pending renderer sends a FrameNavigate message that invokes the | 85 // - The pending renderer sends a FrameNavigate message that invokes the |
| 86 // DidNavigate method. This replaces the current RVH with the | 86 // DidNavigate method. This replaces the current RVH with the |
| 87 // pending RVH and goes back to the NORMAL RendererState. | 87 // pending RVH and goes back to the NORMAL RendererState. |
| 88 | 88 |
| 89 using base::TimeDelta; |
| 90 using base::TimeTicks; |
| 91 |
| 89 namespace { | 92 namespace { |
| 90 | 93 |
| 91 // Amount of time we wait between when a key event is received and the renderer | 94 // Amount of time we wait between when a key event is received and the renderer |
| 92 // is queried for its state and pushed to the NavigationEntry. | 95 // is queried for its state and pushed to the NavigationEntry. |
| 93 const int kQueryStateDelay = 5000; | 96 const int kQueryStateDelay = 5000; |
| 94 | 97 |
| 95 const int kSyncWaitDelay = 40; | 98 const int kSyncWaitDelay = 40; |
| 96 | 99 |
| 97 // If another javascript message box is displayed within | 100 // If another javascript message box is displayed within |
| 98 // kJavascriptMessageExpectedDelay of a previous javascript message box being | 101 // kJavascriptMessageExpectedDelay of a previous javascript message box being |
| (...skipping 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1750 // The favicon url isn't valid. This means there really isn't a favicon, | 1753 // The favicon url isn't valid. This means there really isn't a favicon, |
| 1751 // or the favicon url wasn't obtained before the load started. This assumes | 1754 // or the favicon url wasn't obtained before the load started. This assumes |
| 1752 // the later. | 1755 // the later. |
| 1753 // TODO(sky): Need a way to set the favicon that doesn't involve generating | 1756 // TODO(sky): Need a way to set the favicon that doesn't involve generating |
| 1754 // its url. | 1757 // its url. |
| 1755 new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer)); | 1758 new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer)); |
| 1756 } | 1759 } |
| 1757 new_url->set_safe_for_autoreplace(true); | 1760 new_url->set_safe_for_autoreplace(true); |
| 1758 url_model->Add(new_url); | 1761 url_model->Add(new_url); |
| 1759 } | 1762 } |
| OLD | NEW |