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

Side by Side Diff: ash/shell.cc

Issue 2758573002: Avoid to call KeyboardController::ResetInstance twice (Closed)
Patch Set: . Created 3 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 // Balances the Install() in Initialize(). 661 // Balances the Install() in Initialize().
662 views::FocusManagerFactory::Install(nullptr); 662 views::FocusManagerFactory::Install(nullptr);
663 663
664 wm_shell_->Shutdown(); 664 wm_shell_->Shutdown();
665 // Depends on |focus_controller_|, so must be destroyed before. 665 // Depends on |focus_controller_|, so must be destroyed before.
666 window_tree_host_manager_.reset(); 666 window_tree_host_manager_.reset();
667 focus_controller_->RemoveObserver(this); 667 focus_controller_->RemoveObserver(this);
668 focus_controller_.reset(); 668 focus_controller_.reset();
669 screen_position_controller_.reset(); 669 screen_position_controller_.reset();
670 670
671 keyboard::KeyboardController::ResetInstance(nullptr);
672
673 display_color_manager_.reset(); 671 display_color_manager_.reset();
674 if (display_change_observer_) 672 if (display_change_observer_)
675 display_configurator_->RemoveObserver(display_change_observer_.get()); 673 display_configurator_->RemoveObserver(display_change_observer_.get());
676 if (display_error_observer_) 674 if (display_error_observer_)
677 display_configurator_->RemoveObserver(display_error_observer_.get()); 675 display_configurator_->RemoveObserver(display_error_observer_.get());
678 if (projecting_observer_) { 676 if (projecting_observer_) {
679 display_configurator_->RemoveObserver(projecting_observer_.get()); 677 display_configurator_->RemoveObserver(projecting_observer_.get());
680 RemoveShellObserver(projecting_observer_.get()); 678 RemoveShellObserver(projecting_observer_.get());
681 } 679 }
682 display_change_observer_.reset(); 680 display_change_observer_.reset();
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 void Shell::OnWindowActivated( 1101 void Shell::OnWindowActivated(
1104 aura::client::ActivationChangeObserver::ActivationReason reason, 1102 aura::client::ActivationChangeObserver::ActivationReason reason,
1105 aura::Window* gained_active, 1103 aura::Window* gained_active,
1106 aura::Window* lost_active) { 1104 aura::Window* lost_active) {
1107 WmWindow* gained_active_wm = WmWindow::Get(gained_active); 1105 WmWindow* gained_active_wm = WmWindow::Get(gained_active);
1108 if (gained_active_wm) 1106 if (gained_active_wm)
1109 root_window_for_new_windows_ = gained_active_wm->GetRootWindow(); 1107 root_window_for_new_windows_ = gained_active_wm->GetRootWindow();
1110 } 1108 }
1111 1109
1112 } // namespace ash 1110 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698