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/root_window_controller.h" | 5 #include "ash/root_window_controller.h" |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
750 | 750 |
751 // Create a shelf if a user is already logged in. | 751 // Create a shelf if a user is already logged in. |
752 if (shell->session_state_delegate()->NumberOfLoggedInUsers()) | 752 if (shell->session_state_delegate()->NumberOfLoggedInUsers()) |
753 shelf()->CreateShelf(); | 753 shelf()->CreateShelf(); |
754 | 754 |
755 // Notify shell observers about new root window. | 755 // Notify shell observers about new root window. |
756 shell->OnRootWindowAdded(root_window); | 756 shell->OnRootWindowAdded(root_window); |
757 } | 757 } |
758 | 758 |
759 #if defined(OS_CHROMEOS) | 759 #if defined(OS_CHROMEOS) |
760 if (CommandLine::ForCurrentProcess()->HasSwitch( | 760 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
761 switches::kAshEnableTouchExplorationMode)) { | 761 switches::kAshDisableTouchExplorationMode)) { |
762 touch_exploration_manager_.reset(new AshTouchExplorationManager(this)); | 762 touch_exploration_manager_.reset(new AshTouchExplorationManager(this)); |
763 } | 763 } |
764 #endif | 764 #endif |
765 } | 765 } |
766 | 766 |
767 void RootWindowController::InitLayoutManagers() { | 767 void RootWindowController::InitLayoutManagers() { |
768 aura::Window* root_window = GetRootWindow(); | 768 aura::Window* root_window = GetRootWindow(); |
769 root_window_layout_ = new RootWindowLayoutManager(root_window); | 769 root_window_layout_ = new RootWindowLayoutManager(root_window); |
770 root_window->SetLayoutManager(root_window_layout_); | 770 root_window->SetLayoutManager(root_window_layout_); |
771 | 771 |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1083 else | 1083 else |
1084 DisableTouchHudProjection(); | 1084 DisableTouchHudProjection(); |
1085 } | 1085 } |
1086 | 1086 |
1087 RootWindowController* GetRootWindowController( | 1087 RootWindowController* GetRootWindowController( |
1088 const aura::Window* root_window) { | 1088 const aura::Window* root_window) { |
1089 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; | 1089 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; |
1090 } | 1090 } |
1091 | 1091 |
1092 } // namespace ash | 1092 } // namespace ash |
OLD | NEW |