| 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 } | 283 } |
| 284 | 284 |
| 285 void BlimpEngineSession::Initialize() { | 285 void BlimpEngineSession::Initialize() { |
| 286 DCHECK(!display::Screen::GetScreen()); | 286 DCHECK(!display::Screen::GetScreen()); |
| 287 display::Screen::SetScreenInstance(screen_.get()); | 287 display::Screen::SetScreenInstance(screen_.get()); |
| 288 | 288 |
| 289 window_tree_host_.reset(new BlimpWindowTreeHost()); | 289 window_tree_host_.reset(new BlimpWindowTreeHost()); |
| 290 | 290 |
| 291 screen_->set_window_tree_host(window_tree_host_.get()); | 291 screen_->set_window_tree_host(window_tree_host_.get()); |
| 292 window_tree_host_->InitHost(); | 292 window_tree_host_->InitHost(); |
| 293 window_tree_host_->window()->Show(); |
| 293 window_tree_host_->window()->SetLayoutManager( | 294 window_tree_host_->window()->SetLayoutManager( |
| 294 new BlimpLayoutManager(window_tree_host_->window())); | 295 new BlimpLayoutManager(window_tree_host_->window())); |
| 295 focus_client_.reset(new wm::FocusController(new FocusRulesImpl)); | 296 focus_client_.reset(new wm::FocusController(new FocusRulesImpl)); |
| 296 aura::client::SetFocusClient(window_tree_host_->window(), | 297 aura::client::SetFocusClient(window_tree_host_->window(), |
| 297 focus_client_.get()); | 298 focus_client_.get()); |
| 298 aura::client::SetActivationClient(window_tree_host_->window(), | 299 aura::client::SetActivationClient(window_tree_host_->window(), |
| 299 focus_client_.get()); | 300 focus_client_.get()); |
| 300 capture_client_.reset( | 301 capture_client_.reset( |
| 301 new aura::client::DefaultCaptureClient(window_tree_host_->window())); | 302 new aura::client::DefaultCaptureClient(window_tree_host_->window())); |
| 302 | 303 |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 parent->AddChild(content); | 581 parent->AddChild(content); |
| 581 content->Show(); | 582 content->Show(); |
| 582 | 583 |
| 583 tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id, | 584 tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id, |
| 584 &render_widget_feature_, | 585 &render_widget_feature_, |
| 585 navigation_message_sender_.get()); | 586 navigation_message_sender_.get()); |
| 586 } | 587 } |
| 587 | 588 |
| 588 } // namespace engine | 589 } // namespace engine |
| 589 } // namespace blimp | 590 } // namespace blimp |
| OLD | NEW |