| OLD | NEW |
| 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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 // order) since they have the second highest priority. | 637 // order) since they have the second highest priority. |
| 638 DCHECK_EQ(2U, GetRootWindowEventFilterCount()); | 638 DCHECK_EQ(2U, GetRootWindowEventFilterCount()); |
| 639 #if !defined(OS_MACOSX) | 639 #if !defined(OS_MACOSX) |
| 640 accelerator_filter_.reset(new internal::AcceleratorFilter); | 640 accelerator_filter_.reset(new internal::AcceleratorFilter); |
| 641 AddRootWindowEventFilter(accelerator_filter_.get()); | 641 AddRootWindowEventFilter(accelerator_filter_.get()); |
| 642 DCHECK_EQ(3U, GetRootWindowEventFilterCount()); | 642 DCHECK_EQ(3U, GetRootWindowEventFilterCount()); |
| 643 #endif | 643 #endif |
| 644 input_method_filter_.reset(new internal::InputMethodEventFilter); | 644 input_method_filter_.reset(new internal::InputMethodEventFilter); |
| 645 AddRootWindowEventFilter(input_method_filter_.get()); | 645 AddRootWindowEventFilter(input_method_filter_.get()); |
| 646 | 646 |
| 647 root_window->SetCursor(aura::kCursorPointer); | 647 root_window->SetCursor(ui::kCursorPointer); |
| 648 if (initially_hide_cursor_) | 648 if (initially_hide_cursor_) |
| 649 root_window->ShowCursor(false); | 649 root_window->ShowCursor(false); |
| 650 | 650 |
| 651 activation_controller_.reset(new internal::ActivationController); | 651 activation_controller_.reset(new internal::ActivationController); |
| 652 | 652 |
| 653 CreateSpecialContainers(root_window); | 653 CreateSpecialContainers(root_window); |
| 654 | 654 |
| 655 stacking_controller_.reset(new internal::StackingController); | 655 stacking_controller_.reset(new internal::StackingController); |
| 656 | 656 |
| 657 root_window_layout_ = new internal::RootWindowLayoutManager(root_window); | 657 root_window_layout_ = new internal::RootWindowLayoutManager(root_window); |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 912 desktop_background_controller_->SetDesktopBackgroundImageMode( | 912 desktop_background_controller_->SetDesktopBackgroundImageMode( |
| 913 GetWallpaper(index), GetWallpaperInfo(index).layout); | 913 GetWallpaper(index), GetWallpaperInfo(index).layout); |
| 914 } | 914 } |
| 915 | 915 |
| 916 void Shell::DisableWorkspaceGridLayout() { | 916 void Shell::DisableWorkspaceGridLayout() { |
| 917 if (workspace_controller_.get()) | 917 if (workspace_controller_.get()) |
| 918 workspace_controller_->workspace_manager()->set_grid_size(0); | 918 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 919 } | 919 } |
| 920 | 920 |
| 921 } // namespace ash | 921 } // namespace ash |
| OLD | NEW |