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 19 matching lines...) Expand all Loading... |
30 #include "ash/gpu_support.h" | 30 #include "ash/gpu_support.h" |
31 #include "ash/high_contrast/high_contrast_controller.h" | 31 #include "ash/high_contrast/high_contrast_controller.h" |
32 #include "ash/host/ash_window_tree_host_init_params.h" | 32 #include "ash/host/ash_window_tree_host_init_params.h" |
33 #include "ash/ime/input_method_event_handler.h" | 33 #include "ash/ime/input_method_event_handler.h" |
34 #include "ash/keyboard/keyboard_ui.h" | 34 #include "ash/keyboard/keyboard_ui.h" |
35 #include "ash/keyboard_uma_event_filter.h" | 35 #include "ash/keyboard_uma_event_filter.h" |
36 #include "ash/magnifier/magnification_controller.h" | 36 #include "ash/magnifier/magnification_controller.h" |
37 #include "ash/magnifier/partial_magnification_controller.h" | 37 #include "ash/magnifier/partial_magnification_controller.h" |
38 #include "ash/media_delegate.h" | 38 #include "ash/media_delegate.h" |
39 #include "ash/new_window_delegate.h" | 39 #include "ash/new_window_delegate.h" |
| 40 #include "ash/renderer_context_menu/open_with_menu_controller.h" |
40 #include "ash/root_window_controller.h" | 41 #include "ash/root_window_controller.h" |
41 #include "ash/session/session_state_delegate.h" | 42 #include "ash/session/session_state_delegate.h" |
42 #include "ash/shelf/app_list_shelf_item_delegate.h" | 43 #include "ash/shelf/app_list_shelf_item_delegate.h" |
43 #include "ash/shelf/shelf_delegate.h" | 44 #include "ash/shelf/shelf_delegate.h" |
44 #include "ash/shelf/shelf_item_delegate.h" | 45 #include "ash/shelf/shelf_item_delegate.h" |
45 #include "ash/shelf/shelf_item_delegate_manager.h" | 46 #include "ash/shelf/shelf_item_delegate_manager.h" |
46 #include "ash/shelf/shelf_layout_manager.h" | 47 #include "ash/shelf/shelf_layout_manager.h" |
47 #include "ash/shelf/shelf_model.h" | 48 #include "ash/shelf/shelf_model.h" |
48 #include "ash/shelf/shelf_widget.h" | 49 #include "ash/shelf/shelf_widget.h" |
49 #include "ash/shelf/shelf_window_watcher.h" | 50 #include "ash/shelf/shelf_window_watcher.h" |
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
633 } | 634 } |
634 | 635 |
635 //////////////////////////////////////////////////////////////////////////////// | 636 //////////////////////////////////////////////////////////////////////////////// |
636 // Shell, private: | 637 // Shell, private: |
637 | 638 |
638 Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool) | 639 Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool) |
639 : target_root_window_(nullptr), | 640 : target_root_window_(nullptr), |
640 scoped_target_root_window_(nullptr), | 641 scoped_target_root_window_(nullptr), |
641 delegate_(delegate), | 642 delegate_(delegate), |
642 window_positioner_(new WindowPositioner), | 643 window_positioner_(new WindowPositioner), |
| 644 open_with_menu_controller_(new OpenWithMenuController), |
643 activation_client_(nullptr), | 645 activation_client_(nullptr), |
644 #if defined(OS_CHROMEOS) | 646 #if defined(OS_CHROMEOS) |
645 display_configurator_(new ui::DisplayConfigurator()), | 647 display_configurator_(new ui::DisplayConfigurator()), |
646 #endif // defined(OS_CHROMEOS) | 648 #endif // defined(OS_CHROMEOS) |
647 native_cursor_manager_(nullptr), | 649 native_cursor_manager_(nullptr), |
648 simulate_modal_window_open_for_testing_(false), | 650 simulate_modal_window_open_for_testing_(false), |
649 is_touch_hud_projection_enabled_(false), | 651 is_touch_hud_projection_enabled_(false), |
650 blocking_pool_(blocking_pool) { | 652 blocking_pool_(blocking_pool) { |
651 DCHECK(delegate_.get()); | 653 DCHECK(delegate_.get()); |
652 DCHECK(aura::Env::GetInstanceDontCreate()); | 654 DCHECK(aura::Env::GetInstanceDontCreate()); |
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1204 | 1206 |
1205 void Shell::OnWindowActivated( | 1207 void Shell::OnWindowActivated( |
1206 aura::client::ActivationChangeObserver::ActivationReason reason, | 1208 aura::client::ActivationChangeObserver::ActivationReason reason, |
1207 aura::Window* gained_active, | 1209 aura::Window* gained_active, |
1208 aura::Window* lost_active) { | 1210 aura::Window* lost_active) { |
1209 if (gained_active) | 1211 if (gained_active) |
1210 target_root_window_ = gained_active->GetRootWindow(); | 1212 target_root_window_ = gained_active->GetRootWindow(); |
1211 } | 1213 } |
1212 | 1214 |
1213 } // namespace ash | 1215 } // namespace ash |
OLD | NEW |