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

Side by Side Diff: ash/shell.h

Issue 308683002: Move MaximizeModeWindowManager to the controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 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
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
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 #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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 // Deactivates the virtual keyboard. 319 // Deactivates the virtual keyboard.
320 void DeactivateKeyboard(); 320 void DeactivateKeyboard();
321 321
322 // Show shelf view if it was created hidden (before session has started). 322 // Show shelf view if it was created hidden (before session has started).
323 void ShowShelf(); 323 void ShowShelf();
324 324
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.
330 void EnableMaximizeModeWindowManager(bool enable);
331
332 // Test if the MaximizeModeWindowManager is enabled or not.
333 bool IsMaximizeModeWindowManagerEnabled();
334
335 #if defined(OS_CHROMEOS) 329 #if defined(OS_CHROMEOS)
336 // Test if MaximizeModeWindowManager is not enabled, and if 330 // Test if MaximizeModeWindowManager is not enabled, and if
337 // MaximizeModeController is not currently setting a display rotation. Or if 331 // MaximizeModeController is not currently setting a display rotation. Or if
338 // the |resolution_notification_controller_| is not showing its confirmation 332 // the |resolution_notification_controller_| is not showing its confirmation
339 // dialog. If true then changes to display settings can be saved. 333 // dialog. If true then changes to display settings can be saved.
340 bool ShouldSaveDisplaySettings(); 334 bool ShouldSaveDisplaySettings();
341 #endif 335 #endif
342 336
343 AcceleratorController* accelerator_controller() { 337 AcceleratorController* accelerator_controller() {
344 return accelerator_controller_.get(); 338 return accelerator_controller_.get();
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 691
698 // An event filter that pre-handles all key events to send them to an IME. 692 // An event filter that pre-handles all key events to send them to an IME.
699 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; 693 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;
700 694
701 scoped_ptr<DisplayManager> display_manager_; 695 scoped_ptr<DisplayManager> display_manager_;
702 scoped_ptr<base::WeakPtrFactory<DisplayManager> > 696 scoped_ptr<base::WeakPtrFactory<DisplayManager> >
703 weak_display_manager_factory_; 697 weak_display_manager_factory_;
704 698
705 scoped_ptr<LocaleNotificationController> locale_notification_controller_; 699 scoped_ptr<LocaleNotificationController> locale_notification_controller_;
706 700
707 // The maximized window manager (if enabled).
708 scoped_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_;
709
710 scoped_ptr<AccelerometerController> accelerometer_controller_; 701 scoped_ptr<AccelerometerController> accelerometer_controller_;
711 702
712 #if defined(OS_CHROMEOS) 703 #if defined(OS_CHROMEOS)
713 scoped_ptr<PowerEventObserver> power_event_observer_; 704 scoped_ptr<PowerEventObserver> power_event_observer_;
714 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; 705 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
715 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; 706 scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
716 scoped_ptr<StickyKeysController> sticky_keys_controller_; 707 scoped_ptr<StickyKeysController> sticky_keys_controller_;
717 scoped_ptr<ResolutionNotificationController> 708 scoped_ptr<ResolutionNotificationController>
718 resolution_notification_controller_; 709 resolution_notification_controller_;
719 scoped_ptr<BluetoothNotificationController> 710 scoped_ptr<BluetoothNotificationController>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 751
761 // Injected content::GPUDataManager support. 752 // Injected content::GPUDataManager support.
762 scoped_ptr<GPUSupport> gpu_support_; 753 scoped_ptr<GPUSupport> gpu_support_;
763 754
764 DISALLOW_COPY_AND_ASSIGN(Shell); 755 DISALLOW_COPY_AND_ASSIGN(Shell);
765 }; 756 };
766 757
767 } // namespace ash 758 } // namespace ash
768 759
769 #endif // ASH_SHELL_H_ 760 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698