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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 2827193004: Make PrefService available in *ash (Closed)
Patch Set: sky's comments Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« ash/mus/shell_delegate_mus.cc ('K') | « ash/shell.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 11b3861a31b7cc78069445d521bb5500c53273bc..e853f3d4869698bf37805f1926b9f820ceacca6a 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -376,6 +376,13 @@ void Shell::UpdateShelfVisibility() {
root->GetRootWindowController()->GetShelf()->UpdateVisibilityState();
}
+PrefService* Shell::GetActiveUserPrefService() const {
+ if (shell_port_->GetAshConfig() == Config::MASH)
+ return pref_service_.get();
+
+ return shell_delegate_->GetActiveUserPrefService();
+}
+
WebNotificationTray* Shell::GetWebNotificationTray() {
return GetPrimaryRootWindowController()
->GetStatusAreaWidget()
« ash/mus/shell_delegate_mus.cc ('K') | « ash/shell.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698