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

Side by Side Diff: ash/shell.cc

Issue 11047030: Decouple EventClientImpl and root window. Check containers on the same root window as focused windo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 8 years, 2 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 | Annotate | Revision Log
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/focus_manager_factory.h" 10 #include "ash/accelerators/focus_manager_factory.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 249
250 // These need a valid Shell instance to clean up properly, so explicitly 250 // These need a valid Shell instance to clean up properly, so explicitly
251 // delete them before invalidating the instance. 251 // delete them before invalidating the instance.
252 // Alphabetical. 252 // Alphabetical.
253 drag_drop_controller_.reset(); 253 drag_drop_controller_.reset();
254 magnification_controller_.reset(); 254 magnification_controller_.reset();
255 power_button_controller_.reset(); 255 power_button_controller_.reset();
256 resize_shadow_controller_.reset(); 256 resize_shadow_controller_.reset();
257 shadow_controller_.reset(); 257 shadow_controller_.reset();
258 tooltip_controller_.reset(); 258 tooltip_controller_.reset();
259 event_client_.reset();
259 window_cycle_controller_.reset(); 260 window_cycle_controller_.reset();
260 capture_controller_.reset(); 261 capture_controller_.reset();
261 nested_dispatcher_controller_.reset(); 262 nested_dispatcher_controller_.reset();
262 user_action_client_.reset(); 263 user_action_client_.reset();
263 visibility_controller_.reset(); 264 visibility_controller_.reset();
264 265
265 // This also deletes all RootWindows. 266 // This also deletes all RootWindows.
266 display_controller_.reset(); 267 display_controller_.reset();
267 screen_position_controller_.reset(); 268 screen_position_controller_.reset();
268 269
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 442
442 high_contrast_controller_.reset(new HighContrastController); 443 high_contrast_controller_.reset(new HighContrastController);
443 video_detector_.reset(new VideoDetector); 444 video_detector_.reset(new VideoDetector);
444 window_cycle_controller_.reset( 445 window_cycle_controller_.reset(
445 new WindowCycleController(activation_controller_.get())); 446 new WindowCycleController(activation_controller_.get()));
446 447
447 tooltip_controller_.reset(new internal::TooltipController( 448 tooltip_controller_.reset(new internal::TooltipController(
448 drag_drop_controller_.get())); 449 drag_drop_controller_.get()));
449 AddEnvEventFilter(tooltip_controller_.get()); 450 AddEnvEventFilter(tooltip_controller_.get());
450 451
452 event_client_.reset(new internal::EventClientImpl);
453
451 InitRootWindowController(root_window_controller); 454 InitRootWindowController(root_window_controller);
452 455
453 // This controller needs to be set before SetupManagedWindowMode. 456 // This controller needs to be set before SetupManagedWindowMode.
454 desktop_background_controller_.reset(new DesktopBackgroundController()); 457 desktop_background_controller_.reset(new DesktopBackgroundController());
455 if (delegate_.get()) 458 if (delegate_.get())
456 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); 459 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
457 if (!user_wallpaper_delegate_.get()) 460 if (!user_wallpaper_delegate_.get())
458 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate()); 461 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate());
459 462
460 // Launcher must be created after secondary displays are initialized. 463 // Launcher must be created after secondary displays are initialized.
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 root_window->set_focus_manager(focus_manager_.get()); 727 root_window->set_focus_manager(focus_manager_.get());
725 input_method_filter_->SetInputMethodPropertyInRootWindow(root_window); 728 input_method_filter_->SetInputMethodPropertyInRootWindow(root_window);
726 aura::client::SetActivationClient(root_window, activation_controller_.get()); 729 aura::client::SetActivationClient(root_window, activation_controller_.get());
727 aura::client::SetVisibilityClient(root_window, visibility_controller_.get()); 730 aura::client::SetVisibilityClient(root_window, visibility_controller_.get());
728 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get()); 731 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get());
729 aura::client::SetCaptureClient(root_window, capture_controller_.get()); 732 aura::client::SetCaptureClient(root_window, capture_controller_.get());
730 aura::client::SetScreenPositionClient(root_window, 733 aura::client::SetScreenPositionClient(root_window,
731 screen_position_controller_.get()); 734 screen_position_controller_.get());
732 aura::client::SetCursorClient(root_window, &cursor_manager_); 735 aura::client::SetCursorClient(root_window, &cursor_manager_);
733 aura::client::SetTooltipClient(root_window, tooltip_controller_.get()); 736 aura::client::SetTooltipClient(root_window, tooltip_controller_.get());
737 aura::client::SetEventClient(root_window, event_client_.get());
734 738
735 if (nested_dispatcher_controller_.get()) { 739 if (nested_dispatcher_controller_.get()) {
736 aura::client::SetDispatcherClient(root_window, 740 aura::client::SetDispatcherClient(root_window,
737 nested_dispatcher_controller_.get()); 741 nested_dispatcher_controller_.get());
738 } 742 }
739 if (user_action_client_.get()) 743 if (user_action_client_.get())
740 aura::client::SetUserActionClient(root_window, user_action_client_.get()); 744 aura::client::SetUserActionClient(root_window, user_action_client_.get());
741 745
742 root_window->SetCursor(ui::kCursorPointer); 746 root_window->SetCursor(ui::kCursorPointer);
743 controller->InitLayoutManagers(); 747 controller->InitLayoutManagers();
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 iter != controllers.end(); ++iter) { 819 iter != controllers.end(); ++iter) {
816 if ((*iter)->GetSystemModalLayoutManager()-> 820 if ((*iter)->GetSystemModalLayoutManager()->
817 CanWindowReceiveEvents(window)) { 821 CanWindowReceiveEvents(window)) {
818 return true; 822 return true;
819 } 823 }
820 } 824 }
821 return false; 825 return false;
822 } 826 }
823 827
824 } // namespace ash 828 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698