OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 if (!params.url.SchemeIs(chrome::kJavaScriptScheme)) | 267 if (!params.url.SchemeIs(chrome::kJavaScriptScheme)) |
268 delegate_->DidStartLoading(); | 268 delegate_->DidStartLoading(); |
269 } | 269 } |
270 } | 270 } |
271 | 271 |
272 void RenderViewHost::NavigateToURL(const GURL& url) { | 272 void RenderViewHost::NavigateToURL(const GURL& url) { |
273 ViewMsg_Navigate_Params params; | 273 ViewMsg_Navigate_Params params; |
274 params.page_id = -1; | 274 params.page_id = -1; |
275 params.url = url; | 275 params.url = url; |
276 params.transition = PageTransition::LINK; | 276 params.transition = PageTransition::LINK; |
277 params.reload = false; | 277 params.navigation_type = ViewMsg_Navigate_Params::NORMAL; |
278 Navigate(params); | 278 Navigate(params); |
279 } | 279 } |
280 | 280 |
281 void RenderViewHost::LoadAlternateHTMLString(const std::string& html_text, | 281 void RenderViewHost::LoadAlternateHTMLString(const std::string& html_text, |
282 bool new_navigation, | 282 bool new_navigation, |
283 const GURL& display_url, | 283 const GURL& display_url, |
284 const std::string& security_info) { | 284 const std::string& security_info) { |
285 Send(new ViewMsg_LoadAlternateHTMLText(routing_id(), html_text, | 285 Send(new ViewMsg_LoadAlternateHTMLText(routing_id(), html_text, |
286 new_navigation, display_url, | 286 new_navigation, display_url, |
287 security_info)); | 287 security_info)); |
(...skipping 1444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1732 #endif | 1732 #endif |
1733 } | 1733 } |
1734 | 1734 |
1735 void RenderViewHost::OnCSSInserted() { | 1735 void RenderViewHost::OnCSSInserted() { |
1736 delegate_->DidInsertCSS(); | 1736 delegate_->DidInsertCSS(); |
1737 } | 1737 } |
1738 | 1738 |
1739 void RenderViewHost::UpdateBrowserWindowId(int window_id) { | 1739 void RenderViewHost::UpdateBrowserWindowId(int window_id) { |
1740 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id)); | 1740 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id)); |
1741 } | 1741 } |
OLD | NEW |