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

Side by Side Diff: ash/shell.cc

Issue 20415002: Add window overview mode behind --ash-enable-overview-mode flag to F5 key. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove implicit cast to bool. Created 7 years, 4 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 | « ash/shell.h ('k') | ash/shell_delegate.h » ('j') | 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 9
10 #include "ash/accelerators/focus_manager_factory.h" 10 #include "ash/accelerators/focus_manager_factory.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "ash/wm/screen_dimmer.h" 60 #include "ash/wm/screen_dimmer.h"
61 #include "ash/wm/session_state_controller_impl.h" 61 #include "ash/wm/session_state_controller_impl.h"
62 #include "ash/wm/system_gesture_event_filter.h" 62 #include "ash/wm/system_gesture_event_filter.h"
63 #include "ash/wm/system_modal_container_event_filter.h" 63 #include "ash/wm/system_modal_container_event_filter.h"
64 #include "ash/wm/system_modal_container_layout_manager.h" 64 #include "ash/wm/system_modal_container_layout_manager.h"
65 #include "ash/wm/user_activity_detector.h" 65 #include "ash/wm/user_activity_detector.h"
66 #include "ash/wm/video_detector.h" 66 #include "ash/wm/video_detector.h"
67 #include "ash/wm/window_animations.h" 67 #include "ash/wm/window_animations.h"
68 #include "ash/wm/window_cycle_controller.h" 68 #include "ash/wm/window_cycle_controller.h"
69 #include "ash/wm/window_properties.h" 69 #include "ash/wm/window_properties.h"
70 #include "ash/wm/window_selector_controller.h"
70 #include "ash/wm/window_util.h" 71 #include "ash/wm/window_util.h"
71 #include "ash/wm/workspace_controller.h" 72 #include "ash/wm/workspace_controller.h"
72 #include "base/bind.h" 73 #include "base/bind.h"
73 #include "base/command_line.h" 74 #include "base/command_line.h"
74 #include "base/debug/leak_annotations.h" 75 #include "base/debug/leak_annotations.h"
75 #include "ui/aura/client/aura_constants.h" 76 #include "ui/aura/client/aura_constants.h"
76 #include "ui/aura/client/user_action_client.h" 77 #include "ui/aura/client/user_action_client.h"
77 #include "ui/aura/env.h" 78 #include "ui/aura/env.h"
78 #include "ui/aura/focus_manager.h" 79 #include "ui/aura/focus_manager.h"
79 #include "ui/aura/layout_manager.h" 80 #include "ui/aura/layout_manager.h"
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 magnification_controller_.reset( 570 magnification_controller_.reset(
570 MagnificationController::CreateInstance()); 571 MagnificationController::CreateInstance());
571 mru_window_tracker_.reset(new MruWindowTracker(activation_client_)); 572 mru_window_tracker_.reset(new MruWindowTracker(activation_client_));
572 573
573 partial_magnification_controller_.reset( 574 partial_magnification_controller_.reset(
574 new PartialMagnificationController()); 575 new PartialMagnificationController());
575 576
576 high_contrast_controller_.reset(new HighContrastController); 577 high_contrast_controller_.reset(new HighContrastController);
577 video_detector_.reset(new VideoDetector); 578 video_detector_.reset(new VideoDetector);
578 window_cycle_controller_.reset(new WindowCycleController()); 579 window_cycle_controller_.reset(new WindowCycleController());
580 window_selector_controller_.reset(new WindowSelectorController());
579 581
580 tooltip_controller_.reset(new views::corewm::TooltipController( 582 tooltip_controller_.reset(new views::corewm::TooltipController(
581 gfx::SCREEN_TYPE_ALTERNATE)); 583 gfx::SCREEN_TYPE_ALTERNATE));
582 AddPreTargetHandler(tooltip_controller_.get()); 584 AddPreTargetHandler(tooltip_controller_.get());
583 585
584 event_client_.reset(new internal::EventClientImpl); 586 event_client_.reset(new internal::EventClientImpl);
585 587
586 // This controller needs to be set before SetupManagedWindowMode. 588 // This controller needs to be set before SetupManagedWindowMode.
587 desktop_background_controller_.reset(new DesktopBackgroundController()); 589 desktop_background_controller_.reset(new DesktopBackgroundController());
588 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); 590 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
969 //////////////////////////////////////////////////////////////////////////////// 971 ////////////////////////////////////////////////////////////////////////////////
970 // Shell, aura::client::ActivationChangeObserver implementation: 972 // Shell, aura::client::ActivationChangeObserver implementation:
971 973
972 void Shell::OnWindowActivated(aura::Window* gained_active, 974 void Shell::OnWindowActivated(aura::Window* gained_active,
973 aura::Window* lost_active) { 975 aura::Window* lost_active) {
974 if (gained_active) 976 if (gained_active)
975 active_root_window_ = gained_active->GetRootWindow(); 977 active_root_window_ = gained_active->GetRootWindow();
976 } 978 }
977 979
978 } // namespace ash 980 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698