| Index: storage/browser/quota/storage_observer.cc
|
| diff --git a/webkit/browser/quota/storage_observer.cc b/storage/browser/quota/storage_observer.cc
|
| similarity index 44%
|
| rename from webkit/browser/quota/storage_observer.cc
|
| rename to storage/browser/quota/storage_observer.cc
|
| index 907ed59e323350a5e7326b61f9f7109095b64b20..b65ccad384af02cf1ef08340de9aed6a6d5048c3 100644
|
| --- a/webkit/browser/quota/storage_observer.cc
|
| +++ b/storage/browser/quota/storage_observer.cc
|
| @@ -2,14 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/browser/quota/storage_observer.h"
|
| +#include "storage/browser/quota/storage_observer.h"
|
|
|
| namespace quota {
|
|
|
| // StorageObserver::Filter
|
|
|
| -StorageObserver::Filter::Filter()
|
| - : storage_type(kStorageTypeUnknown) {
|
| +StorageObserver::Filter::Filter() : storage_type(kStorageTypeUnknown) {
|
| }
|
|
|
| StorageObserver::Filter::Filter(StorageType storage_type, const GURL& origin)
|
| @@ -17,8 +16,7 @@ StorageObserver::Filter::Filter(StorageType storage_type, const GURL& origin)
|
| }
|
|
|
| bool StorageObserver::Filter::operator==(const Filter& other) const {
|
| - return storage_type == other.storage_type &&
|
| - origin == other.origin;
|
| + return storage_type == other.storage_type && origin == other.origin;
|
| }
|
|
|
| // StorageObserver::MonitorParams
|
| @@ -27,29 +25,24 @@ StorageObserver::MonitorParams::MonitorParams()
|
| : dispatch_initial_state(false) {
|
| }
|
|
|
| -StorageObserver::MonitorParams::MonitorParams(
|
| - StorageType storage_type,
|
| - const GURL& origin,
|
| - const base::TimeDelta& rate,
|
| - bool get_initial_state)
|
| - : filter(storage_type, origin),
|
| - rate(rate),
|
| - dispatch_initial_state(get_initial_state) {
|
| +StorageObserver::MonitorParams::MonitorParams(StorageType storage_type,
|
| + const GURL& origin,
|
| + const base::TimeDelta& rate,
|
| + bool get_initial_state)
|
| + : filter(storage_type, origin),
|
| + rate(rate),
|
| + dispatch_initial_state(get_initial_state) {
|
| }
|
|
|
| -StorageObserver::MonitorParams::MonitorParams(
|
| - const Filter& filter,
|
| - const base::TimeDelta& rate,
|
| - bool get_initial_state)
|
| - : filter(filter),
|
| - rate(rate),
|
| - dispatch_initial_state(get_initial_state) {
|
| +StorageObserver::MonitorParams::MonitorParams(const Filter& filter,
|
| + const base::TimeDelta& rate,
|
| + bool get_initial_state)
|
| + : filter(filter), rate(rate), dispatch_initial_state(get_initial_state) {
|
| }
|
|
|
| // StorageObserver::Event
|
|
|
| -StorageObserver::Event::Event()
|
| - : usage(0), quota(0) {
|
| +StorageObserver::Event::Event() : usage(0), quota(0) {
|
| }
|
|
|
| StorageObserver::Event::Event(const Filter& filter, int64 usage, int64 quota)
|
| @@ -57,9 +50,7 @@ StorageObserver::Event::Event(const Filter& filter, int64 usage, int64 quota)
|
| }
|
|
|
| bool StorageObserver::Event::operator==(const Event& other) const {
|
| - return filter == other.filter &&
|
| - usage == other.usage &&
|
| - quota == other.quota;
|
| + return filter == other.filter && usage == other.usage && quota == other.quota;
|
| }
|
|
|
| } // namespace quota
|
|
|