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

Side by Side Diff: ash/shell.h

Issue 2827193004: Make PrefService available in *ash (Closed)
Patch Set: Adding NOTREACHED() comment. Created 3 years, 7 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/mus/shell_delegate_mus.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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 void set_link_handler_model_factory( 357 void set_link_handler_model_factory(
358 LinkHandlerModelFactory* link_handler_model_factory) { 358 LinkHandlerModelFactory* link_handler_model_factory) {
359 link_handler_model_factory_ = link_handler_model_factory; 359 link_handler_model_factory_ = link_handler_model_factory;
360 } 360 }
361 PowerButtonController* power_button_controller() { 361 PowerButtonController* power_button_controller() {
362 return power_button_controller_.get(); 362 return power_button_controller_.get();
363 } 363 }
364 LockStateController* lock_state_controller() { 364 LockStateController* lock_state_controller() {
365 return lock_state_controller_.get(); 365 return lock_state_controller_.get();
366 } 366 }
367 PrefService* pref_service() { return pref_service_.get(); }
368 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } 367 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
369 ShellDelegate* shell_delegate() { return shell_delegate_.get(); } 368 ShellDelegate* shell_delegate() { return shell_delegate_.get(); }
370 VideoDetector* video_detector() { return video_detector_.get(); } 369 VideoDetector* video_detector() { return video_detector_.get(); }
371 WallpaperController* wallpaper_controller() { 370 WallpaperController* wallpaper_controller() {
372 return wallpaper_controller_.get(); 371 return wallpaper_controller_.get();
373 } 372 }
374 WallpaperDelegate* wallpaper_delegate() { return wallpaper_delegate_.get(); } 373 WallpaperDelegate* wallpaper_delegate() { return wallpaper_delegate_.get(); }
375 WindowTreeHostManager* window_tree_host_manager() { 374 WindowTreeHostManager* window_tree_host_manager() {
376 return window_tree_host_manager_.get(); 375 return window_tree_host_manager_.get();
377 } 376 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 } 414 }
416 415
417 ToastManager* toast_manager() { return toast_manager_.get(); } 416 ToastManager* toast_manager() { return toast_manager_.get(); }
418 417
419 aura::client::ActivationClient* activation_client(); 418 aura::client::ActivationClient* activation_client();
420 419
421 // Force the shelf to query for it's current visibility state. 420 // Force the shelf to query for it's current visibility state.
422 // TODO(jamescook): Move to Shelf. 421 // TODO(jamescook): Move to Shelf.
423 void UpdateShelfVisibility(); 422 void UpdateShelfVisibility();
424 423
424 // Gets the current active user pref service.
425 // In classic ash, it will be null if there's no active user.
426 // In the case of mash, it can be null if it failed to or hasn't yet
427 // connected to the pref service.
428 //
429 // NOTE: Users of this pref service MUST listen to
430 // ash::SessionObserver::OnActiveUserSessionChanged() and recall this function
431 // to get the newly activated user's pref service, and use it to re-read the
432 // desired stored settings.
433 PrefService* GetActiveUserPrefService() const;
434
425 // Returns WebNotificationTray on the primary root window. 435 // Returns WebNotificationTray on the primary root window.
426 WebNotificationTray* GetWebNotificationTray(); 436 WebNotificationTray* GetWebNotificationTray();
427 437
428 // Does the primary display have status area? 438 // Does the primary display have status area?
429 bool HasPrimaryStatusArea(); 439 bool HasPrimaryStatusArea();
430 440
431 // Returns the system tray on primary display. 441 // Returns the system tray on primary display.
432 SystemTray* GetPrimarySystemTray(); 442 SystemTray* GetPrimarySystemTray();
433 443
434 static void set_initially_hide_cursor(bool hide) { 444 static void set_initially_hide_cursor(bool hide) {
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 base::ObserverList<ShellObserver> shell_observers_; 809 base::ObserverList<ShellObserver> shell_observers_;
800 810
801 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 811 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
802 812
803 DISALLOW_COPY_AND_ASSIGN(Shell); 813 DISALLOW_COPY_AND_ASSIGN(Shell);
804 }; 814 };
805 815
806 } // namespace ash 816 } // namespace ash
807 817
808 #endif // ASH_SHELL_H_ 818 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698