OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/shell.h" | 5 #include "ash/shell.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
633 } | 633 } |
634 | 634 |
635 //////////////////////////////////////////////////////////////////////////////// | 635 //////////////////////////////////////////////////////////////////////////////// |
636 // Shell, private: | 636 // Shell, private: |
637 | 637 |
638 Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool) | 638 Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool) |
639 : target_root_window_(nullptr), | 639 : target_root_window_(nullptr), |
640 scoped_target_root_window_(nullptr), | 640 scoped_target_root_window_(nullptr), |
641 delegate_(delegate), | 641 delegate_(delegate), |
642 shelf_model_(new ShelfModel), | 642 shelf_model_(new ShelfModel), |
| 643 link_handler_model_factory_(nullptr), |
643 activation_client_(nullptr), | 644 activation_client_(nullptr), |
644 #if defined(OS_CHROMEOS) | 645 #if defined(OS_CHROMEOS) |
645 display_configurator_(new ui::DisplayConfigurator()), | 646 display_configurator_(new ui::DisplayConfigurator()), |
646 #endif // defined(OS_CHROMEOS) | 647 #endif // defined(OS_CHROMEOS) |
647 native_cursor_manager_(nullptr), | 648 native_cursor_manager_(nullptr), |
648 simulate_modal_window_open_for_testing_(false), | 649 simulate_modal_window_open_for_testing_(false), |
649 is_touch_hud_projection_enabled_(false), | 650 is_touch_hud_projection_enabled_(false), |
650 blocking_pool_(blocking_pool) { | 651 blocking_pool_(blocking_pool) { |
651 DCHECK(delegate_.get()); | 652 DCHECK(delegate_.get()); |
652 DCHECK(aura::Env::GetInstanceDontCreate()); | 653 DCHECK(aura::Env::GetInstanceDontCreate()); |
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1232 | 1233 |
1233 void Shell::OnWindowActivated( | 1234 void Shell::OnWindowActivated( |
1234 aura::client::ActivationChangeObserver::ActivationReason reason, | 1235 aura::client::ActivationChangeObserver::ActivationReason reason, |
1235 aura::Window* gained_active, | 1236 aura::Window* gained_active, |
1236 aura::Window* lost_active) { | 1237 aura::Window* lost_active) { |
1237 if (gained_active) | 1238 if (gained_active) |
1238 target_root_window_ = gained_active->GetRootWindow(); | 1239 target_root_window_ = gained_active->GetRootWindow(); |
1239 } | 1240 } |
1240 | 1241 |
1241 } // namespace ash | 1242 } // namespace ash |
OLD | NEW |