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

Side by Side Diff: ash/shell.cc

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: More refactor Created 8 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 | 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 8
9 #include "ash/app_list/app_list.h" 9 #include "ash/app_list/app_list.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/desktop_background/desktop_background_controller.h"
11 #include "ash/drag_drop/drag_drop_controller.h" 12 #include "ash/drag_drop/drag_drop_controller.h"
12 #include "ash/focus_cycler.h" 13 #include "ash/focus_cycler.h"
13 #include "ash/ime/input_method_event_filter.h" 14 #include "ash/ime/input_method_event_filter.h"
14 #include "ash/launcher/launcher.h" 15 #include "ash/launcher/launcher.h"
15 #include "ash/shell_delegate.h" 16 #include "ash/shell_delegate.h"
16 #include "ash/shell_factory.h" 17 #include "ash/shell_factory.h"
17 #include "ash/shell_window_ids.h" 18 #include "ash/shell_window_ids.h"
18 #include "ash/system/audio/tray_volume.h" 19 #include "ash/system/audio/tray_volume.h"
19 #include "ash/system/brightness/tray_brightness.h" 20 #include "ash/system/brightness/tray_brightness.h"
20 #include "ash/system/settings/tray_settings.h" 21 #include "ash/system/settings/tray_settings.h"
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 468
468 window_modality_controller_.reset(new internal::WindowModalityController); 469 window_modality_controller_.reset(new internal::WindowModalityController);
469 AddRootWindowEventFilter(window_modality_controller_.get()); 470 AddRootWindowEventFilter(window_modality_controller_.get());
470 471
471 visibility_controller_.reset(new internal::VisibilityController); 472 visibility_controller_.reset(new internal::VisibilityController);
472 473
473 tooltip_controller_.reset(new internal::TooltipController); 474 tooltip_controller_.reset(new internal::TooltipController);
474 AddRootWindowEventFilter(tooltip_controller_.get()); 475 AddRootWindowEventFilter(tooltip_controller_.get());
475 476
476 drag_drop_controller_.reset(new internal::DragDropController); 477 drag_drop_controller_.reset(new internal::DragDropController);
478 desktop_background_controller_.reset(new DesktopBackgroundController);
477 power_button_controller_.reset(new PowerButtonController); 479 power_button_controller_.reset(new PowerButtonController);
478 video_detector_.reset(new VideoDetector); 480 video_detector_.reset(new VideoDetector);
479 window_cycle_controller_.reset(new WindowCycleController); 481 window_cycle_controller_.reset(new WindowCycleController);
480 } 482 }
481 483
482 Shell::WindowMode Shell::ComputeWindowMode(CommandLine* command_line) const { 484 Shell::WindowMode Shell::ComputeWindowMode(CommandLine* command_line) const {
483 if (compact_window_mode_for_test_) 485 if (compact_window_mode_for_test_)
484 return MODE_COMPACT; 486 return MODE_COMPACT;
485 487
486 // Some devices don't perform well with overlapping windows. 488 // Some devices don't perform well with overlapping windows.
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 void Shell::ResetLayoutManager(int container_id) { 676 void Shell::ResetLayoutManager(int container_id) {
675 GetContainer(container_id)->SetLayoutManager(NULL); 677 GetContainer(container_id)->SetLayoutManager(NULL);
676 } 678 }
677 679
678 void Shell::DisableWorkspaceGridLayout() { 680 void Shell::DisableWorkspaceGridLayout() {
679 if (workspace_controller_.get()) 681 if (workspace_controller_.get())
680 workspace_controller_->workspace_manager()->set_grid_size(0); 682 workspace_controller_->workspace_manager()->set_grid_size(0);
681 } 683 }
682 684
683 } // namespace ash 685 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698