| Index: Source/core/page/NetworkStateNotifier.h
|
| diff --git a/Source/core/page/NetworkStateNotifier.h b/Source/core/page/NetworkStateNotifier.h
|
| index 8d1868925b560a710f53a1ed9258b9f61b1acd04..66290b7c00fa531e61c2a83a98538ae59f0bdc2f 100644
|
| --- a/Source/core/page/NetworkStateNotifier.h
|
| +++ b/Source/core/page/NetworkStateNotifier.h
|
| @@ -44,12 +44,12 @@ public:
|
| class NetworkStateObserver {
|
| public:
|
| // Will be called on the thread of the context passed in addObserver.
|
| - virtual void connectionTypeChange(blink::WebConnectionType) = 0;
|
| + virtual void connectionTypeChange(WebConnectionType) = 0;
|
| };
|
|
|
| NetworkStateNotifier()
|
| : m_isOnLine(true)
|
| - , m_type(blink::ConnectionTypeOther)
|
| + , m_type(ConnectionTypeOther)
|
| , m_testUpdatesOnly(false)
|
| {
|
| }
|
| @@ -62,13 +62,13 @@ public:
|
|
|
| void setOnLine(bool);
|
|
|
| - blink::WebConnectionType connectionType() const
|
| + WebConnectionType connectionType() const
|
| {
|
| MutexLocker locker(m_mutex);
|
| return m_type;
|
| }
|
|
|
| - void setWebConnectionType(blink::WebConnectionType);
|
| + void setWebConnectionType(WebConnectionType);
|
|
|
| // Must be called on the context's thread. An added observer must be removed
|
| // before its ExecutionContext is deleted. It's possible for an observer to
|
| @@ -83,7 +83,7 @@ public:
|
| // can update the connection type. This is used for layout tests (see crbug.com/377736).
|
| void setTestUpdatesOnly(bool);
|
| // Tests should call this as it will change the type regardless of the value of m_testUpdatesOnly.
|
| - void setWebConnectionTypeForTest(blink::WebConnectionType);
|
| + void setWebConnectionTypeForTest(WebConnectionType);
|
|
|
| private:
|
| struct ObserverList {
|
| @@ -96,11 +96,11 @@ private:
|
| Vector<size_t> zeroedObservers; // Indices in observers that are 0.
|
| };
|
|
|
| - void setWebConnectionTypeImpl(blink::WebConnectionType);
|
| + void setWebConnectionTypeImpl(WebConnectionType);
|
|
|
| using ObserverListMap = HashMap<ExecutionContext*, OwnPtr<ObserverList>>;
|
|
|
| - void notifyObserversOnContext(blink::WebConnectionType, ExecutionContext*);
|
| + void notifyObserversOnContext(WebConnectionType, ExecutionContext*);
|
|
|
| ObserverList* lockAndFindObserverList(ExecutionContext*);
|
|
|
| @@ -111,7 +111,7 @@ private:
|
|
|
| mutable Mutex m_mutex;
|
| bool m_isOnLine;
|
| - blink::WebConnectionType m_type;
|
| + WebConnectionType m_type;
|
| ObserverListMap m_observers;
|
| bool m_testUpdatesOnly;
|
| };
|
|
|