OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/renderer_host/render_view_host.h" | 5 #include "chrome/browser/renderer_host/render_view_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 // favicon is displayed) happens synchronously. If the start loading | 221 // favicon is displayed) happens synchronously. If the start loading |
222 // messages was asynchronous, then the default favicon would flash in. | 222 // messages was asynchronous, then the default favicon would flash in. |
223 // | 223 // |
224 // WebKit doesn't send throb notifications for JavaScript URLs, so we | 224 // WebKit doesn't send throb notifications for JavaScript URLs, so we |
225 // don't want to either. | 225 // don't want to either. |
226 if (!params.url.SchemeIs(chrome::kJavaScriptScheme)) | 226 if (!params.url.SchemeIs(chrome::kJavaScriptScheme)) |
227 delegate_->DidStartLoading(); | 227 delegate_->DidStartLoading(); |
228 } | 228 } |
229 const GURL& url = params.url; | 229 const GURL& url = params.url; |
230 if (!delegate_->IsExternalTabContainer() && | 230 if (!delegate_->IsExternalTabContainer() && |
231 (url.SchemeIs("http") || url.SchemeIs("https"))) | 231 (url.SchemeIs("http") || url.SchemeIs("https") || |
| 232 url.SchemeIs("httpsv"))) |
232 chrome_browser_net::PreconnectUrlAndSubresources(url); | 233 chrome_browser_net::PreconnectUrlAndSubresources(url); |
233 } | 234 } |
234 | 235 |
235 void RenderViewHost::NavigateToURL(const GURL& url) { | 236 void RenderViewHost::NavigateToURL(const GURL& url) { |
236 ViewMsg_Navigate_Params params; | 237 ViewMsg_Navigate_Params params; |
237 params.page_id = -1; | 238 params.page_id = -1; |
238 params.url = url; | 239 params.url = url; |
239 params.transition = PageTransition::LINK; | 240 params.transition = PageTransition::LINK; |
240 params.navigation_type = ViewMsg_Navigate_Params::NORMAL; | 241 params.navigation_type = ViewMsg_Navigate_Params::NORMAL; |
241 Navigate(params); | 242 Navigate(params); |
(...skipping 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1715 LOG(DFATAL) << "Invalid checked state " << checked_state; | 1716 LOG(DFATAL) << "Invalid checked state " << checked_state; |
1716 return; | 1717 return; |
1717 } | 1718 } |
1718 | 1719 |
1719 CommandState state; | 1720 CommandState state; |
1720 state.is_enabled = is_enabled; | 1721 state.is_enabled = is_enabled; |
1721 state.checked_state = | 1722 state.checked_state = |
1722 static_cast<RenderViewCommandCheckedState>(checked_state); | 1723 static_cast<RenderViewCommandCheckedState>(checked_state); |
1723 command_states_[static_cast<RenderViewCommand>(command)] = state; | 1724 command_states_[static_cast<RenderViewCommand>(command)] = state; |
1724 } | 1725 } |
OLD | NEW |