| 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 #ifndef ASH_SHELL_H_ | 5 #ifndef ASH_SHELL_H_ |
| 6 #define ASH_SHELL_H_ | 6 #define ASH_SHELL_H_ |
| 7 | 7 |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 // Adds/removes observer. | 325 // Adds/removes observer. |
| 326 void AddShellObserver(ShellObserver* observer); | 326 void AddShellObserver(ShellObserver* observer); |
| 327 void RemoveShellObserver(ShellObserver* observer); | 327 void RemoveShellObserver(ShellObserver* observer); |
| 328 | 328 |
| 329 // Turn the always maximize mode window manager on or off. | 329 // Turn the always maximize mode window manager on or off. |
| 330 void EnableMaximizeModeWindowManager(bool enable); | 330 void EnableMaximizeModeWindowManager(bool enable); |
| 331 | 331 |
| 332 // Test if the MaximizeModeWindowManager is enabled or not. | 332 // Test if the MaximizeModeWindowManager is enabled or not. |
| 333 bool IsMaximizeModeWindowManagerEnabled(); | 333 bool IsMaximizeModeWindowManagerEnabled(); |
| 334 | 334 |
| 335 #if defined(OS_CHROMEOS) |
| 336 // Test if MaximizeModeWindowManager is not enabled, and if |
| 337 // MaximizeModeController is not currently setting a display rotation. Or if |
| 338 // the |resolution_notification_controller_| is not showing its confirmation |
| 339 // dialog. If true then changes to display settings can be saved. |
| 340 bool ShouldSaveDisplaySettings(); |
| 341 #endif |
| 342 |
| 335 AcceleratorController* accelerator_controller() { | 343 AcceleratorController* accelerator_controller() { |
| 336 return accelerator_controller_.get(); | 344 return accelerator_controller_.get(); |
| 337 } | 345 } |
| 338 | 346 |
| 339 DisplayManager* display_manager() { return display_manager_.get(); } | 347 DisplayManager* display_manager() { return display_manager_.get(); } |
| 340 ::wm::InputMethodEventFilter* input_method_filter() { | 348 ::wm::InputMethodEventFilter* input_method_filter() { |
| 341 return input_method_filter_.get(); | 349 return input_method_filter_.get(); |
| 342 } | 350 } |
| 343 ::wm::CompoundEventFilter* env_filter() { | 351 ::wm::CompoundEventFilter* env_filter() { |
| 344 return env_filter_.get(); | 352 return env_filter_.get(); |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 752 | 760 |
| 753 // Injected content::GPUDataManager support. | 761 // Injected content::GPUDataManager support. |
| 754 scoped_ptr<GPUSupport> gpu_support_; | 762 scoped_ptr<GPUSupport> gpu_support_; |
| 755 | 763 |
| 756 DISALLOW_COPY_AND_ASSIGN(Shell); | 764 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 757 }; | 765 }; |
| 758 | 766 |
| 759 } // namespace ash | 767 } // namespace ash |
| 760 | 768 |
| 761 #endif // ASH_SHELL_H_ | 769 #endif // ASH_SHELL_H_ |
| OLD | NEW |