| Index: ash/common/wm_shell.h
|
| diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
|
| index f13fb91ff488616fd40aa8f3164c335ba39c8765..f9b17aab46e4417704d068eed1a83676fbe1e243 100644
|
| --- a/ash/common/wm_shell.h
|
| +++ b/ash/common/wm_shell.h
|
| @@ -41,7 +41,7 @@ class Point;
|
| }
|
|
|
| namespace preferences {
|
| -class PrefObserverStore;
|
| +class PrefClientStore;
|
| }
|
|
|
| namespace views {
|
| @@ -171,7 +171,7 @@ class ASH_EXPORT WmShell : public SessionStateObserver,
|
|
|
| PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
|
|
|
| - preferences::PrefObserverStore* pref_store() { return pref_store_.get(); }
|
| + preferences::PrefClientStore* pref_store() { return pref_store_.get(); }
|
|
|
| SessionController* session_controller() { return session_controller_.get(); }
|
|
|
| @@ -506,7 +506,7 @@ class ASH_EXPORT WmShell : public SessionStateObserver,
|
| base::ObserverList<ShellObserver> shell_observers_;
|
| std::unique_ptr<ShellDelegate> delegate_;
|
|
|
| - scoped_refptr<preferences::PrefObserverStore> pref_store_;
|
| + scoped_refptr<preferences::PrefClientStore> pref_store_;
|
|
|
| std::unique_ptr<AcceleratorController> accelerator_controller_;
|
| std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
|
|
|