OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "blimp/engine/session/blimp_engine_session.h" | 5 #include "blimp/engine/session/blimp_engine_session.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
508 const gfx::Rect& initial_rect, | 508 const gfx::Rect& initial_rect, |
509 bool user_gesture, | 509 bool user_gesture, |
510 bool* was_blocked) { | 510 bool* was_blocked) { |
511 NOTIMPLEMENTED(); | 511 NOTIMPLEMENTED(); |
512 } | 512 } |
513 | 513 |
514 content::WebContents* BlimpEngineSession::OpenURLFromTab( | 514 content::WebContents* BlimpEngineSession::OpenURLFromTab( |
515 content::WebContents* source, | 515 content::WebContents* source, |
516 const content::OpenURLParams& params) { | 516 const content::OpenURLParams& params) { |
517 // CURRENT_TAB is the only one we implement for now. | 517 // CURRENT_TAB is the only one we implement for now. |
518 if (params.disposition != CURRENT_TAB) { | 518 if (params.disposition != WindowOpenDisposition::CURRENT_TAB) { |
519 NOTIMPLEMENTED(); | 519 NOTIMPLEMENTED(); |
520 return nullptr; | 520 return nullptr; |
521 } | 521 } |
522 | 522 |
523 // TODO(haibinlu): Add helper method to get LoadURLParams from OpenURLParams. | 523 // TODO(haibinlu): Add helper method to get LoadURLParams from OpenURLParams. |
524 content::NavigationController::LoadURLParams load_url_params(params.url); | 524 content::NavigationController::LoadURLParams load_url_params(params.url); |
525 load_url_params.source_site_instance = params.source_site_instance; | 525 load_url_params.source_site_instance = params.source_site_instance; |
526 load_url_params.referrer = params.referrer; | 526 load_url_params.referrer = params.referrer; |
527 load_url_params.frame_tree_node_id = params.frame_tree_node_id; | 527 load_url_params.frame_tree_node_id = params.frame_tree_node_id; |
528 load_url_params.transition_type = params.transition; | 528 load_url_params.transition_type = params.transition; |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
580 parent->AddChild(content); | 580 parent->AddChild(content); |
581 content->Show(); | 581 content->Show(); |
582 | 582 |
583 tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id, | 583 tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id, |
584 &render_widget_feature_, | 584 &render_widget_feature_, |
585 navigation_message_sender_.get()); | 585 navigation_message_sender_.get()); |
586 } | 586 } |
587 | 587 |
588 } // namespace engine | 588 } // namespace engine |
589 } // namespace blimp | 589 } // namespace blimp |
OLD | NEW |