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

Side by Side Diff: ash/shell.cc

Issue 9689027: MonitorManager to manage multiple monitors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: crash fix 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
« no previous file with comments | « no previous file | ash/wm/base_layout_manager.h » ('j') | ui/aura/monitor.h » ('J')
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 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"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "ash/wm/window_modality_controller.h" 49 #include "ash/wm/window_modality_controller.h"
50 #include "ash/wm/window_util.h" 50 #include "ash/wm/window_util.h"
51 #include "ash/wm/workspace_controller.h" 51 #include "ash/wm/workspace_controller.h"
52 #include "ash/wm/workspace/workspace_event_filter.h" 52 #include "ash/wm/workspace/workspace_event_filter.h"
53 #include "ash/wm/workspace/workspace_layout_manager.h" 53 #include "ash/wm/workspace/workspace_layout_manager.h"
54 #include "ash/wm/workspace/workspace_manager.h" 54 #include "ash/wm/workspace/workspace_manager.h"
55 #include "base/bind.h" 55 #include "base/bind.h"
56 #include "base/command_line.h" 56 #include "base/command_line.h"
57 #include "third_party/skia/include/core/SkBitmap.h" 57 #include "third_party/skia/include/core/SkBitmap.h"
58 #include "ui/aura/client/aura_constants.h" 58 #include "ui/aura/client/aura_constants.h"
59 #include "ui/aura/env.h"
59 #include "ui/aura/layout_manager.h" 60 #include "ui/aura/layout_manager.h"
60 #include "ui/aura/root_window.h" 61 #include "ui/aura/root_window.h"
61 #include "ui/aura/window.h" 62 #include "ui/aura/window.h"
62 #include "ui/gfx/compositor/layer.h" 63 #include "ui/gfx/compositor/layer.h"
63 #include "ui/gfx/compositor/layer_animator.h" 64 #include "ui/gfx/compositor/layer_animator.h"
64 #include "ui/gfx/screen.h"
65 #include "ui/gfx/size.h" 65 #include "ui/gfx/size.h"
66 #include "ui/views/widget/native_widget_aura.h" 66 #include "ui/views/widget/native_widget_aura.h"
67 #include "ui/views/widget/widget.h" 67 #include "ui/views/widget/widget.h"
68 68
69 #if !defined(OS_MACOSX) 69 #if !defined(OS_MACOSX)
70 #include "ash/accelerators/accelerator_controller.h" 70 #include "ash/accelerators/accelerator_controller.h"
71 #include "ash/accelerators/accelerator_filter.h" 71 #include "ash/accelerators/accelerator_filter.h"
72 #include "ash/accelerators/nested_dispatcher_controller.h" 72 #include "ash/accelerators/nested_dispatcher_controller.h"
73 #endif 73 #endif
74 74
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 // Create the desktop background image. 628 // Create the desktop background image.
629 SetDesktopBackgroundMode(BACKGROUND_IMAGE); 629 SetDesktopBackgroundMode(BACKGROUND_IMAGE);
630 } 630 }
631 631
632 void Shell::DisableWorkspaceGridLayout() { 632 void Shell::DisableWorkspaceGridLayout() {
633 if (workspace_controller_.get()) 633 if (workspace_controller_.get())
634 workspace_controller_->workspace_manager()->set_grid_size(0); 634 workspace_controller_->workspace_manager()->set_grid_size(0);
635 } 635 }
636 636
637 } // namespace ash 637 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/wm/base_layout_manager.h » ('j') | ui/aura/monitor.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698