| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/shell.h" | 5 #include "content/shell/browser/shell.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 load_url_params.source_site_instance = params.source_site_instance; | 318 load_url_params.source_site_instance = params.source_site_instance; |
| 319 load_url_params.transition_type = params.transition; | 319 load_url_params.transition_type = params.transition; |
| 320 load_url_params.frame_tree_node_id = params.frame_tree_node_id; | 320 load_url_params.frame_tree_node_id = params.frame_tree_node_id; |
| 321 load_url_params.referrer = params.referrer; | 321 load_url_params.referrer = params.referrer; |
| 322 load_url_params.redirect_chain = params.redirect_chain; | 322 load_url_params.redirect_chain = params.redirect_chain; |
| 323 load_url_params.extra_headers = params.extra_headers; | 323 load_url_params.extra_headers = params.extra_headers; |
| 324 load_url_params.is_renderer_initiated = params.is_renderer_initiated; | 324 load_url_params.is_renderer_initiated = params.is_renderer_initiated; |
| 325 load_url_params.should_replace_current_entry = | 325 load_url_params.should_replace_current_entry = |
| 326 params.should_replace_current_entry; | 326 params.should_replace_current_entry; |
| 327 | 327 |
| 328 // Only allows the browser-initiated navigation to use POST. | 328 if (params.uses_post) { |
| 329 if (params.uses_post && !params.is_renderer_initiated) { | 329 load_url_params.load_type = NavigationController::LOAD_TYPE_HTTP_POST; |
| 330 load_url_params.load_type = | 330 load_url_params.post_data = params.post_data; |
| 331 NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST; | |
| 332 load_url_params.browser_initiated_post_data = | |
| 333 params.browser_initiated_post_data; | |
| 334 } | 331 } |
| 335 | 332 |
| 336 source->GetController().LoadURLWithParams(load_url_params); | 333 source->GetController().LoadURLWithParams(load_url_params); |
| 337 return source; | 334 return source; |
| 338 } | 335 } |
| 339 | 336 |
| 340 void Shell::LoadingStateChanged(WebContents* source, | 337 void Shell::LoadingStateChanged(WebContents* source, |
| 341 bool to_different_document) { | 338 bool to_different_document) { |
| 342 UpdateNavigationControls(to_different_document); | 339 UpdateNavigationControls(to_different_document); |
| 343 PlatformSetIsLoading(source->IsLoading()); | 340 PlatformSetIsLoading(source->IsLoading()); |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 devtools_frontend_->Activate(); | 475 devtools_frontend_->Activate(); |
| 479 devtools_frontend_->Focus(); | 476 devtools_frontend_->Focus(); |
| 480 } | 477 } |
| 481 | 478 |
| 482 void Shell::OnDevToolsWebContentsDestroyed() { | 479 void Shell::OnDevToolsWebContentsDestroyed() { |
| 483 devtools_observer_.reset(); | 480 devtools_observer_.reset(); |
| 484 devtools_frontend_ = NULL; | 481 devtools_frontend_ = NULL; |
| 485 } | 482 } |
| 486 | 483 |
| 487 } // namespace content | 484 } // namespace content |
| OLD | NEW |