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

Side by Side Diff: ash/shell.cc

Issue 10407089: Revert 138212 - Implement High Contrast mode for Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
« no previous file with comments | « ash/shell.h ('k') | chrome/browser/chrome_browser_main_extra_parts_ash.cc » ('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"
11 #include "ash/ash_switches.h" 11 #include "ash/ash_switches.h"
12 #include "ash/desktop_background/desktop_background_controller.h" 12 #include "ash/desktop_background/desktop_background_controller.h"
13 #include "ash/desktop_background/desktop_background_resources.h" 13 #include "ash/desktop_background/desktop_background_resources.h"
14 #include "ash/desktop_background/desktop_background_view.h" 14 #include "ash/desktop_background/desktop_background_view.h"
15 #include "ash/drag_drop/drag_drop_controller.h" 15 #include "ash/drag_drop/drag_drop_controller.h"
16 #include "ash/focus_cycler.h" 16 #include "ash/focus_cycler.h"
17 #include "ash/high_contrast/high_contrast_controller.h"
18 #include "ash/launcher/launcher.h" 17 #include "ash/launcher/launcher.h"
19 #include "ash/magnifier/magnification_controller.h" 18 #include "ash/magnifier/magnification_controller.h"
20 #include "ash/monitor/monitor_controller.h" 19 #include "ash/monitor/monitor_controller.h"
21 #include "ash/monitor/multi_monitor_manager.h" 20 #include "ash/monitor/multi_monitor_manager.h"
22 #include "ash/screen_ash.h" 21 #include "ash/screen_ash.h"
23 #include "ash/shell_context_menu.h" 22 #include "ash/shell_context_menu.h"
24 #include "ash/shell_delegate.h" 23 #include "ash/shell_delegate.h"
25 #include "ash/shell_factory.h" 24 #include "ash/shell_factory.h"
26 #include "ash/shell_window_ids.h" 25 #include "ash/shell_window_ids.h"
27 #include "ash/system/bluetooth/bluetooth_observer.h" 26 #include "ash/system/bluetooth/bluetooth_observer.h"
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 window_modality_controller_.reset(new internal::WindowModalityController); 747 window_modality_controller_.reset(new internal::WindowModalityController);
749 AddRootWindowEventFilter(window_modality_controller_.get()); 748 AddRootWindowEventFilter(window_modality_controller_.get());
750 749
751 visibility_controller_.reset(new internal::VisibilityController); 750 visibility_controller_.reset(new internal::VisibilityController);
752 751
753 tooltip_controller_.reset(new internal::TooltipController); 752 tooltip_controller_.reset(new internal::TooltipController);
754 AddRootWindowEventFilter(tooltip_controller_.get()); 753 AddRootWindowEventFilter(tooltip_controller_.get());
755 754
756 drag_drop_controller_.reset(new internal::DragDropController); 755 drag_drop_controller_.reset(new internal::DragDropController);
757 magnification_controller_.reset(new internal::MagnificationController); 756 magnification_controller_.reset(new internal::MagnificationController);
758 high_contrast_controller_.reset(new HighContrastController);
759 power_button_controller_.reset(new PowerButtonController); 757 power_button_controller_.reset(new PowerButtonController);
760 AddShellObserver(power_button_controller_.get()); 758 AddShellObserver(power_button_controller_.get());
761 video_detector_.reset(new VideoDetector); 759 video_detector_.reset(new VideoDetector);
762 window_cycle_controller_.reset(new WindowCycleController); 760 window_cycle_controller_.reset(new WindowCycleController);
763 monitor_controller_.reset(new internal::MonitorController); 761 monitor_controller_.reset(new internal::MonitorController);
764 screen_dimmer_.reset(new internal::ScreenDimmer); 762 screen_dimmer_.reset(new internal::ScreenDimmer);
765 763
766 views::FocusManagerFactory::Install(new AshFocusManagerFactory); 764 views::FocusManagerFactory::Install(new AshFocusManagerFactory);
767 } 765 }
768 766
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 panel_container->SetLayoutManager(panel_layout_manager_); 958 panel_container->SetLayoutManager(panel_layout_manager_);
961 } 959 }
962 } 960 }
963 961
964 void Shell::DisableWorkspaceGridLayout() { 962 void Shell::DisableWorkspaceGridLayout() {
965 if (workspace_controller_.get()) 963 if (workspace_controller_.get())
966 workspace_controller_->workspace_manager()->set_grid_size(0); 964 workspace_controller_->workspace_manager()->set_grid_size(0);
967 } 965 }
968 966
969 } // namespace ash 967 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | chrome/browser/chrome_browser_main_extra_parts_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698