| commit | 15eb928d886a49c90111f25af454be9df4fba3a7 | [log] [tgz] |
|---|---|---|
| author | afakhry <[email protected]> | Thu Apr 27 04:03:31 2017 |
| committer | Commit bot <[email protected]> | Thu Apr 27 04:03:31 2017 |
| tree | a2530d9ae16c3e65e7f98decb7fccee5ed1253cb | |
| parent | bb4bab6e5cfcaf5b8b8511fa6986d571f23cc034 [diff] [blame] |
Make PrefService available in *ash This CL adds a temporary solution to make the active user's pref service available in *ash. BUG=713934 Review-Url: https://codereview.chromium.org/2827193004 Cr-Commit-Position: refs/heads/master@{#467576}
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 6474dd5f..dae311b 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc
@@ -167,6 +167,10 @@ return gfx::Image(); } +PrefService* ShellDelegateImpl::GetActiveUserPrefService() const { + return nullptr; +} + bool ShellDelegateImpl::IsTouchscreenEnabledInPrefs( bool use_local_state) const { return true;