Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(288)

Side by Side Diff: ash/shell.cc

Issue 1760773004: Add "Open with <ARC-app-name>" items to the context menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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.h" 44 #include "ash/shelf/shelf.h"
44 #include "ash/shelf/shelf_delegate.h" 45 #include "ash/shelf/shelf_delegate.h"
45 #include "ash/shelf/shelf_item_delegate.h" 46 #include "ash/shelf/shelf_item_delegate.h"
46 #include "ash/shelf/shelf_item_delegate_manager.h" 47 #include "ash/shelf/shelf_item_delegate_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 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 625
625 //////////////////////////////////////////////////////////////////////////////// 626 ////////////////////////////////////////////////////////////////////////////////
626 // Shell, private: 627 // Shell, private:
627 628
628 Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool) 629 Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool)
629 : target_root_window_(nullptr), 630 : target_root_window_(nullptr),
630 scoped_target_root_window_(nullptr), 631 scoped_target_root_window_(nullptr),
631 delegate_(delegate), 632 delegate_(delegate),
632 shelf_model_(new ShelfModel), 633 shelf_model_(new ShelfModel),
633 window_positioner_(new WindowPositioner), 634 window_positioner_(new WindowPositioner),
635 open_with_menu_controller_(new OpenWithMenuController),
634 activation_client_(nullptr), 636 activation_client_(nullptr),
635 #if defined(OS_CHROMEOS) 637 #if defined(OS_CHROMEOS)
636 display_configurator_(new ui::DisplayConfigurator()), 638 display_configurator_(new ui::DisplayConfigurator()),
637 #endif // defined(OS_CHROMEOS) 639 #endif // defined(OS_CHROMEOS)
638 native_cursor_manager_(nullptr), 640 native_cursor_manager_(nullptr),
639 simulate_modal_window_open_for_testing_(false), 641 simulate_modal_window_open_for_testing_(false),
640 is_touch_hud_projection_enabled_(false), 642 is_touch_hud_projection_enabled_(false),
641 blocking_pool_(blocking_pool) { 643 blocking_pool_(blocking_pool) {
642 DCHECK(delegate_.get()); 644 DCHECK(delegate_.get());
643 DCHECK(aura::Env::GetInstanceDontCreate()); 645 DCHECK(aura::Env::GetInstanceDontCreate());
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 1197
1196 void Shell::OnWindowActivated( 1198 void Shell::OnWindowActivated(
1197 aura::client::ActivationChangeObserver::ActivationReason reason, 1199 aura::client::ActivationChangeObserver::ActivationReason reason,
1198 aura::Window* gained_active, 1200 aura::Window* gained_active,
1199 aura::Window* lost_active) { 1201 aura::Window* lost_active) {
1200 if (gained_active) 1202 if (gained_active)
1201 target_root_window_ = gained_active->GetRootWindow(); 1203 target_root_window_ = gained_active->GetRootWindow();
1202 } 1204 }
1203 1205
1204 } // namespace ash 1206 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698