Chromium Code Reviews| Index: components/cronet/android/cronet_pref_store.h |
| diff --git a/android_webview/browser/aw_pref_store.h b/components/cronet/android/cronet_pref_store.h |
| similarity index 68% |
| copy from android_webview/browser/aw_pref_store.h |
| copy to components/cronet/android/cronet_pref_store.h |
| index 6935c7190a864dd91a18c0d5d99fb386915a552f..b666c6131192227784cb24256038737b45c8288e 100644 |
| --- a/android_webview/browser/aw_pref_store.h |
| +++ b/components/cronet/android/cronet_pref_store.h |
| @@ -1,9 +1,9 @@ |
| -// Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| +// Copyright 2015 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef ANDROID_WEBVIEW_BROWSER_AW_PREF_STORE_H_ |
| -#define ANDROID_WEBVIEW_BROWSER_AW_PREF_STORE_H_ |
| +#ifndef COMPONENTS_CRONET_ANDROID_CRONET_PREF_STORE_H_ |
| +#define COMPONENTS_CRONET_ANDROID_CRONET_PREF_STORE_H_ |
| #include <string> |
| @@ -17,11 +17,12 @@ |
| // in a memory backed store. This is not a persistent prefstore -- we |
| // subclass the PersistentPrefStore here since it is needed by the |
| // PrefService, which in turn is needed by the Autofill component. |
|
mmenke
2015/04/01 15:46:14
As Helen said, the second sentence really makes no
bengr
2015/04/24 02:30:43
Done.
|
| -class AwPrefStore : public PersistentPrefStore { |
| +// TODO(bengr): Move to base/prefs or some other shared location. |
| +class CronetPrefStore : public PersistentPrefStore { |
|
mmenke
2015/04/01 15:46:14
Ok, so now I'm following why you needs a Persisten
mmenke
2015/04/01 15:46:14
We're actually going to be needing to use an on-di
bengr
2015/04/24 02:30:42
Done.
bengr
2015/04/24 02:30:43
Ack. Out of scope for this CL.
|
| public: |
| - AwPrefStore(); |
| + CronetPrefStore(); |
| - // Overriden from PrefStore. |
| + // Overrides from PrefStore: |
| bool GetValue(const std::string& key, |
| const base::Value** result) const override; |
| void AddObserver(PrefStore::Observer* observer) override; |
| @@ -30,10 +31,12 @@ class AwPrefStore : public PersistentPrefStore { |
| bool IsInitializationComplete() const override; |
| // PersistentPrefStore overrides: |
| - bool GetMutableValue(const std::string& key, base::Value** result) override; |
| + bool GetMutableValue(const std::string& key, |
| + base::Value** result) override; |
|
mmenke
2015/04/01 15:46:14
Can this all fit on a single line? Looks like it
bengr
2015/04/24 02:30:43
Done.
|
| void ReportValueChanged(const std::string& key) override; |
| void SetValue(const std::string& key, base::Value* value) override; |
| - void SetValueSilently(const std::string& key, base::Value* value) override; |
| + void SetValueSilently(const std::string& key, |
| + base::Value* value) override; |
|
mmenke
2015/04/01 15:46:14
nit: fix indent, or can this all fir on a single
bengr
2015/04/24 02:30:42
Done.
|
| void RemoveValue(const std::string& key) override; |
| bool ReadOnly() const override; |
| PrefReadError GetReadError() const override; |
| @@ -42,7 +45,7 @@ class AwPrefStore : public PersistentPrefStore { |
| void CommitPendingWrite() override {} |
| protected: |
| - ~AwPrefStore() override; |
| + ~CronetPrefStore() override; |
|
mmenke
2015/04/01 15:46:14
Suggest making this private - no one should be inh
bengr
2015/04/24 02:30:42
Done.
|
| private: |
| // Stores the preference values. |
| @@ -50,7 +53,7 @@ class AwPrefStore : public PersistentPrefStore { |
| ObserverList<PrefStore::Observer, true> observers_; |
| - DISALLOW_COPY_AND_ASSIGN(AwPrefStore); |
| + DISALLOW_COPY_AND_ASSIGN(CronetPrefStore); |
| }; |
| -#endif // ANDROID_WEBVIEW_BROWSER_AW_PREF_STORE_H_ |
| +#endif // COMPONENTS_CRONET_ANDROID_CRONET_PREF_STORE_H_ |