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

Side by Side Diff: ash/shell.cc

Issue 727583002: Regression: Search+Key pops up app launcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 9
10 #include "ash/accelerators/accelerator_controller.h" 10 #include "ash/accelerators/accelerator_controller.h"
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 920
921 overlay_filter_.reset(new OverlayEventFilter); 921 overlay_filter_.reset(new OverlayEventFilter);
922 AddPreTargetHandler(overlay_filter_.get()); 922 AddPreTargetHandler(overlay_filter_.get());
923 AddShellObserver(overlay_filter_.get()); 923 AddShellObserver(overlay_filter_.get());
924 924
925 input_method_filter_.reset(new ::wm::InputMethodEventFilter( 925 input_method_filter_.reset(new ::wm::InputMethodEventFilter(
926 root_window->GetHost()->GetAcceleratedWidget())); 926 root_window->GetHost()->GetAcceleratedWidget()));
927 AddPreTargetHandler(input_method_filter_.get()); 927 AddPreTargetHandler(input_method_filter_.get());
928 928
929 accelerator_filter_.reset(new ::wm::AcceleratorFilter( 929 accelerator_filter_.reset(new ::wm::AcceleratorFilter(
930 scoped_ptr< ::wm::AcceleratorDelegate>(new AcceleratorDelegate).Pass())); 930 scoped_ptr< ::wm::AcceleratorDelegate>(new AcceleratorDelegate).Pass(),
931 accelerator_controller_->accelerator_history()));
931 AddPreTargetHandler(accelerator_filter_.get()); 932 AddPreTargetHandler(accelerator_filter_.get());
932 933
933 event_transformation_handler_.reset(new EventTransformationHandler); 934 event_transformation_handler_.reset(new EventTransformationHandler);
934 AddPreTargetHandler(event_transformation_handler_.get()); 935 AddPreTargetHandler(event_transformation_handler_.get());
935 936
936 toplevel_window_event_handler_.reset(new ToplevelWindowEventHandler); 937 toplevel_window_event_handler_.reset(new ToplevelWindowEventHandler);
937 938
938 system_gesture_filter_.reset(new SystemGestureEventFilter); 939 system_gesture_filter_.reset(new SystemGestureEventFilter);
939 AddPreTargetHandler(system_gesture_filter_.get()); 940 AddPreTargetHandler(system_gesture_filter_.get());
940 941
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 //////////////////////////////////////////////////////////////////////////////// 1160 ////////////////////////////////////////////////////////////////////////////////
1160 // Shell, aura::client::ActivationChangeObserver implementation: 1161 // Shell, aura::client::ActivationChangeObserver implementation:
1161 1162
1162 void Shell::OnWindowActivated(aura::Window* gained_active, 1163 void Shell::OnWindowActivated(aura::Window* gained_active,
1163 aura::Window* lost_active) { 1164 aura::Window* lost_active) {
1164 if (gained_active) 1165 if (gained_active)
1165 target_root_window_ = gained_active->GetRootWindow(); 1166 target_root_window_ = gained_active->GetRootWindow();
1166 } 1167 }
1167 1168
1168 } // namespace ash 1169 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_filter_unittest.cc ('k') | athena/input/accelerator_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698