Cleanup namespace usage in Source/web/*.h

- Merge multiple |namespace blink| blocks
- Remove unnecessary blink:: prefix
- Other minor style fixes.

BUG=

Review URL: https://codereview.chromium.org/474183002

git-svn-id: svn://svn.chromium.org/blink/trunk@180427 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/web/BackForwardClientImpl.h

@@ -34,15 +34,16 @@
 #include "core/page/BackForwardClient.h"
 
 namespace blink {
+
 class WebViewImpl;
 
-class BackForwardClientImpl FINAL : public blink::BackForwardClient {
+class BackForwardClientImpl FINAL : public BackForwardClient {
 public:
     explicit BackForwardClientImpl(WebViewImpl*);
     virtual ~BackForwardClientImpl();
 
 private:
-    // blink::BackForwardList methods:
+    // BackForwardList methods:
     virtual int backListCount() OVERRIDE;
     virtual int forwardListCount() OVERRIDE;
     virtual int backForwardListCount() OVERRIDE;

third_party/WebKit/Source/web/ColorChooserPopupUIController.h

@@ -30,19 +30,16 @@
 #include "web/ColorChooserUIController.h"
 #include "wtf/OwnPtr.h"
 
-namespace blink {
-class ColorChooserClient;
-class PagePopup;
-}
-
 namespace blink {
 
 class ChromeClientImpl;
+class ColorChooserClient;
+class PagePopup;
 
-class ColorChooserPopupUIController FINAL : public ColorChooserUIController, public blink::PagePopupClient  {
+class ColorChooserPopupUIController FINAL : public ColorChooserUIController, public PagePopupClient  {
 
 public:
-    ColorChooserPopupUIController(blink::LocalFrame*, ChromeClientImpl*, blink::ColorChooserClient*);
+    ColorChooserPopupUIController(LocalFrame*, ChromeClientImpl*, ColorChooserClient*);
     virtual ~ColorChooserPopupUIController();
 
     // ColorChooserUIController functions:
@@ -52,9 +49,9 @@ public:
     void endChooser() OVERRIDE;
 
     // PagePopupClient functions:
-    virtual blink::IntSize contentSize() OVERRIDE;
-    virtual void writeDocument(blink::SharedBuffer*) OVERRIDE;
-    virtual blink::Locale& locale() OVERRIDE;
+    virtual IntSize contentSize() OVERRIDE;
+    virtual void writeDocument(SharedBuffer*) OVERRIDE;
+    virtual Locale& locale() OVERRIDE;
     virtual void setValueAndClosePopup(int, const String&) OVERRIDE;
     virtual void setValue(const String&) OVERRIDE;
     virtual void closePopup() OVERRIDE;
@@ -64,10 +61,11 @@ private:
     void openPopup();
 
     ChromeClientImpl* m_chromeClient;
-    blink::ColorChooserClient* m_client;
-    blink::PagePopup* m_popup;
-    blink::Locale& m_locale;
+    ColorChooserClient* m_client;
+    PagePopup* m_popup;
+    Locale& m_locale;
 };
+
 }
 
 #endif // ColorChooserPopupUIController_h

third_party/WebKit/Source/web/ColorChooserUIController.h

@@ -32,23 +32,20 @@
 #include "wtf/OwnPtr.h"
 
 namespace blink {
+
 class ColorChooserClient;
 class LocalFrame;
-}
-
-namespace blink {
-
 class WebColorChooser;
 
-class ColorChooserUIController : public WebColorChooserClient, public blink::ColorChooser {
+class ColorChooserUIController : public WebColorChooserClient, public ColorChooser {
 public:
-    ColorChooserUIController(blink::LocalFrame*, blink::ColorChooserClient*);
+    ColorChooserUIController(LocalFrame*, ColorChooserClient*);
     virtual ~ColorChooserUIController();
 
     virtual void openUI();
 
     // ColorChooser functions:
-    virtual void setSelectedColor(const blink::Color&) OVERRIDE FINAL;
+    virtual void setSelectedColor(const Color&) OVERRIDE FINAL;
     virtual void endChooser() OVERRIDE;
 
     // WebColorChooserClient functions:
@@ -60,9 +57,8 @@ protected:
     OwnPtr<WebColorChooser> m_chooser;
 
 private:
-
-    blink::LocalFrame* m_frame;
-    blink::ColorChooserClient* m_client;
+    LocalFrame* m_frame;
+    ColorChooserClient* m_client;
 };
 
 }

third_party/WebKit/Source/web/CompositionUnderlineBuilder.h

@@ -38,14 +38,14 @@
 namespace blink {
 
 // This class is used for converting from WebCompositionUnderline to
-// blink::CompositionUnderline.
+// CompositionUnderline.
 
-class CompositionUnderlineBuilder : public blink::CompositionUnderline {
+class CompositionUnderlineBuilder : public CompositionUnderline {
 public:
     CompositionUnderlineBuilder(const WebCompositionUnderline& u)
-        : blink::CompositionUnderline(u.startOffset, u.endOffset,
-            blink::Color(u.color), u.thick,
-            blink::Color(u.backgroundColor)) { }
+        : CompositionUnderline(u.startOffset, u.endOffset,
+            Color(u.color), u.thick,
+            Color(u.backgroundColor)) { }
 };
 
 } // namespace blink

third_party/WebKit/Source/web/CompositionUnderlineVectorBuilder.h

@@ -39,7 +39,7 @@
 namespace blink {
 
 // This classes are used for converting from std::vector<WebCompositionUnderline>
-// to Vector<blink::CompositionUnderline>.
+// to Vector<CompositionUnderline>.
 
 class CompositionUnderlineVectorBuilder : public Vector<CompositionUnderline> {
 public:

third_party/WebKit/Source/web/ContextFeaturesClientImpl.h

@@ -35,20 +35,20 @@
 
 namespace blink {
 
-class ContextFeaturesClientImpl FINAL : public blink::ContextFeaturesClient {
+class ContextFeaturesClientImpl FINAL : public ContextFeaturesClient {
 public:
     static PassOwnPtr<ContextFeaturesClientImpl> create()
     {
         return adoptPtr(new ContextFeaturesClientImpl());
     }
 
-    virtual bool isEnabled(blink::Document*, blink::ContextFeatures::FeatureType, bool defaultValue) OVERRIDE;
-    virtual void urlDidChange(blink::Document*) OVERRIDE;
+    virtual bool isEnabled(Document*, ContextFeatures::FeatureType, bool defaultValue) OVERRIDE;
+    virtual void urlDidChange(Document*) OVERRIDE;
 
 private:
     ContextFeaturesClientImpl() { }
 
-    bool askIfIsEnabled(blink::Document*, blink::ContextFeatures::FeatureType, bool defaultValue);
+    bool askIfIsEnabled(Document*, ContextFeatures::FeatureType, bool defaultValue);
 };
 
 } // namespace blink

third_party/WebKit/Source/web/ContextMenuClientImpl.h

@@ -38,14 +38,14 @@ namespace blink {
 class WebViewImpl;
 struct WebContextMenuData;
 
-class ContextMenuClientImpl FINAL : public blink::ContextMenuClient {
+class ContextMenuClientImpl FINAL : public ContextMenuClient {
 public:
     explicit ContextMenuClientImpl(WebViewImpl* webView) : m_webView(webView) { }
     virtual ~ContextMenuClientImpl() {}
-    virtual void showContextMenu(const blink::ContextMenu*) OVERRIDE;
+    virtual void showContextMenu(const ContextMenu*) OVERRIDE;
     virtual void clearContextMenu() OVERRIDE;
 private:
-    void populateCustomMenuItems(const blink::ContextMenu*, WebContextMenuData*);
+    void populateCustomMenuItems(const ContextMenu*, WebContextMenuData*);
     WebViewImpl* m_webView;
 };
 

third_party/WebKit/Source/web/DatabaseClientImpl.h

@@ -36,14 +36,14 @@
 
 namespace blink {
 
-class DatabaseClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<DatabaseClientImpl>, public blink::DatabaseClient {
+class DatabaseClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<DatabaseClientImpl>, public DatabaseClient {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DatabaseClientImpl);
 public:
     static PassOwnPtrWillBeRawPtr<DatabaseClientImpl> create();
 
     virtual ~DatabaseClientImpl();
 
-    virtual bool allowDatabase(blink::ExecutionContext*, const String& name, const String& displayName, unsigned long estimatedSize) OVERRIDE;
+    virtual bool allowDatabase(ExecutionContext*, const String& name, const String& displayName, unsigned long estimatedSize) OVERRIDE;
 
 private:
     DatabaseClientImpl();

third_party/WebKit/Source/web/DragClientImpl.h

@@ -35,19 +35,20 @@
 #include "core/page/DragClient.h"
 
 namespace blink {
+
 class WebViewImpl;
 
-class DragClientImpl FINAL : public blink::DragClient {
+class DragClientImpl FINAL : public DragClient {
 public:
     explicit DragClientImpl(WebViewImpl* webView) : m_webView(webView) { }
 
-    virtual blink::DragDestinationAction actionMaskForDrag(blink::DragData*) OVERRIDE;
+    virtual DragDestinationAction actionMaskForDrag(DragData*) OVERRIDE;
     virtual void startDrag(
-        blink::DragImage*,
-        const blink::IntPoint& dragImageOrigin,
-        const blink::IntPoint& eventPos,
-        blink::DataTransfer*,
-        blink::LocalFrame* frame,
+        DragImage*,
+        const IntPoint& dragImageOrigin,
+        const IntPoint& eventPos,
+        DataTransfer*,
+        LocalFrame*,
         bool isLinkDrag = false) OVERRIDE;
 
 private:

third_party/WebKit/Source/web/EditorClientImpl.h

@@ -35,23 +35,20 @@
 #include "wtf/Forward.h"
 
 namespace blink {
+
 class LocalFrame;
 class HTMLInputElement;
-}
-
-namespace blink {
 class WebViewImpl;
 
-class EditorClientImpl FINAL : public blink::EditorClient {
+class EditorClientImpl FINAL : public EditorClient {
 public:
     explicit EditorClientImpl(WebViewImpl*);
-
     virtual ~EditorClientImpl();
 
     virtual void respondToChangedContents() OVERRIDE;
-    virtual void respondToChangedSelection(blink::LocalFrame*, blink::SelectionType) OVERRIDE;
-    virtual bool canCopyCut(blink::LocalFrame*, bool defaultValue) const OVERRIDE;
-    virtual bool canPaste(blink::LocalFrame*, bool defaultValue) const OVERRIDE;
+    virtual void respondToChangedSelection(LocalFrame*, SelectionType) OVERRIDE;
+    virtual bool canCopyCut(LocalFrame*, bool defaultValue) const OVERRIDE;
+    virtual bool canPaste(LocalFrame*, bool defaultValue) const OVERRIDE;
     virtual bool handleKeyboardEvent() OVERRIDE;
 
 private:

third_party/WebKit/Source/web/ExternalDateTimeChooser.h

@@ -29,19 +29,16 @@
 #if !ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "platform/DateTimeChooser.h"
 
-namespace blink {
-class DateTimeChooserClient;
-}
-
 namespace blink {
 
 class ChromeClientImpl;
+class DateTimeChooserClient;
 class WebString;
 class WebViewClient;
 
-class ExternalDateTimeChooser FINAL : public blink::DateTimeChooser {
+class ExternalDateTimeChooser FINAL : public DateTimeChooser {
 public:
-    static PassRefPtrWillBeRawPtr<ExternalDateTimeChooser> create(ChromeClientImpl*, WebViewClient*, blink::DateTimeChooserClient*, const blink::DateTimeChooserParameters&);
+    static PassRefPtrWillBeRawPtr<ExternalDateTimeChooser> create(ChromeClientImpl*, WebViewClient*, DateTimeChooserClient*, const DateTimeChooserParameters&);
     virtual ~ExternalDateTimeChooser();
 
     // The following functions are for DateTimeChooserCompletion.
@@ -50,13 +47,13 @@ public:
     void didCancelChooser();
 
 private:
-    ExternalDateTimeChooser(blink::DateTimeChooserClient*);
-    bool openDateTimeChooser(ChromeClientImpl*, WebViewClient*, const blink::DateTimeChooserParameters&);
+    ExternalDateTimeChooser(DateTimeChooserClient*);
+    bool openDateTimeChooser(ChromeClientImpl*, WebViewClient*, const DateTimeChooserParameters&);
 
     // DateTimeChooser function:
     virtual void endChooser() OVERRIDE;
 
-    blink::DateTimeChooserClient* m_client;
+    DateTimeChooserClient* m_client;
 };
 
 }

third_party/WebKit/Source/web/FindInPageCoordinates.h

@@ -53,8 +53,8 @@ namespace blink {
 // are scroll-independent, representing any contents scaled to the visible area of their container.
 // The provided methods support scroll:overflow and are CSS position and transform-friendly.
 
-blink::FloatRect findInPageRectFromAbsoluteRect(const blink::FloatRect&, const blink::RenderObject*);
-blink::FloatRect findInPageRectFromRange(blink::Range*);
+FloatRect findInPageRectFromAbsoluteRect(const FloatRect&, const RenderObject*);
+FloatRect findInPageRectFromRange(Range*);
 
 } // namespace blink
 

third_party/WebKit/Source/web/IndexedDBClientImpl.h

@@ -32,16 +32,14 @@
 #include "modules/indexeddb/IndexedDBClient.h"
 
 namespace blink {
-class ExecutionContext;
-}
 
-namespace blink {
+class ExecutionContext;
 
-class IndexedDBClientImpl FINAL : public blink::IndexedDBClient {
+class IndexedDBClientImpl FINAL : public IndexedDBClient {
 public:
-    static blink::IndexedDBClient* create();
+    static IndexedDBClient* create();
 
-    virtual bool allowIndexedDB(blink::ExecutionContext*, const String& name) OVERRIDE;
+    virtual bool allowIndexedDB(ExecutionContext*, const String& name) OVERRIDE;
 
 private:
     IndexedDBClientImpl() { }

third_party/WebKit/Source/web/LinkHighlight.h

@@ -46,7 +46,7 @@ struct WebFloatRect;
 struct WebRect;
 class WebViewImpl;
 
-class LinkHighlight FINAL : public WebContentLayerClient, public WebAnimationDelegate, blink::LinkHighlightClient {
+class LinkHighlight FINAL : public WebContentLayerClient, public WebAnimationDelegate, LinkHighlightClient {
 public:
     static PassOwnPtr<LinkHighlight> create(Node*, WebViewImpl*);
     virtual ~LinkHighlight();
@@ -61,8 +61,8 @@ public:
         WebContentLayerClient::GraphicsContextStatus = GraphicsContextEnabled) OVERRIDE;
 
     // WebAnimationDelegate implementation.
-    virtual void notifyAnimationStarted(double monotonicTime, blink::WebAnimation::TargetProperty) OVERRIDE;
-    virtual void notifyAnimationFinished(double monotonicTime, blink::WebAnimation::TargetProperty) OVERRIDE;
+    virtual void notifyAnimationStarted(double monotonicTime, WebAnimation::TargetProperty) OVERRIDE;
+    virtual void notifyAnimationFinished(double monotonicTime, WebAnimation::TargetProperty) OVERRIDE;
 
     // LinkHighlightClient inplementation.
     virtual void invalidate() OVERRIDE;

third_party/WebKit/Source/web/MIDIClientProxy.h

@@ -34,24 +34,21 @@
 #include "modules/webmidi/MIDIClient.h"
 #include "platform/heap/Handle.h"
 
-namespace blink {
-class MIDIAccessInitializer;
-}
-
 namespace blink {
 
+class MIDIAccessInitializer;
 class WebMIDIClient;
 
-class MIDIClientProxy FINAL : public blink::MIDIClient {
+class MIDIClientProxy FINAL : public MIDIClient {
 public:
     static PassOwnPtr<MIDIClientProxy> create(WebMIDIClient* client)
     {
         return adoptPtr(new MIDIClientProxy(client));
     }
 
-    // blink::MIDIClient
-    virtual void requestSysexPermission(blink::MIDIAccessInitializer*) OVERRIDE;
-    virtual void cancelSysexPermissionRequest(blink::MIDIAccessInitializer*) OVERRIDE;
+    // MIDIClient
+    virtual void requestSysexPermission(MIDIAccessInitializer*) OVERRIDE;
+    virtual void cancelSysexPermissionRequest(MIDIAccessInitializer*) OVERRIDE;
 
 private:
     explicit MIDIClientProxy(WebMIDIClient*);

third_party/WebKit/Source/web/MediaKeysClientImpl.h

@@ -13,12 +13,12 @@ namespace blink {
 class WebContentDecryptionModule;
 class WebViewImpl;
 
-class MediaKeysClientImpl FINAL : public blink::MediaKeysClient {
+class MediaKeysClientImpl FINAL : public MediaKeysClient {
 public:
     MediaKeysClientImpl();
 
-    // blink::MediaKeysClient implementation.
-    virtual PassOwnPtr<WebContentDecryptionModule> createContentDecryptionModule(blink::ExecutionContext*, const String& keySystem) OVERRIDE;
+    // MediaKeysClient implementation.
+    virtual PassOwnPtr<WebContentDecryptionModule> createContentDecryptionModule(ExecutionContext*, const String& keySystem) OVERRIDE;
 };
 
 } // namespace blink

third_party/WebKit/Source/web/NavigatorContentUtilsClientImpl.h

@@ -12,14 +12,14 @@ namespace blink {
 
 class WebViewImpl;
 
-class NavigatorContentUtilsClientImpl FINAL : public blink::NavigatorContentUtilsClient {
+class NavigatorContentUtilsClientImpl FINAL : public NavigatorContentUtilsClient {
 public:
     static PassOwnPtr<NavigatorContentUtilsClientImpl> create(WebViewImpl*);
     virtual ~NavigatorContentUtilsClientImpl() { }
 
-    virtual void registerProtocolHandler(const String& scheme, const blink::KURL& baseURL, const blink::KURL&, const String& title) OVERRIDE;
-    virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const blink::KURL& baseURL, const blink::KURL&) OVERRIDE;
-    virtual void unregisterProtocolHandler(const String& scheme, const blink::KURL& baseURL, const blink::KURL&) OVERRIDE;
+    virtual void registerProtocolHandler(const String& scheme, const KURL& baseURL, const KURL&, const String& title) OVERRIDE;
+    virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const KURL& baseURL, const KURL&) OVERRIDE;
+    virtual void unregisterProtocolHandler(const String& scheme, const KURL& baseURL, const KURL&) OVERRIDE;
 
 private:
     explicit NavigatorContentUtilsClientImpl(WebViewImpl*);

third_party/WebKit/Source/web/PageOverlayList.h

@@ -34,11 +34,9 @@
 #include "wtf/Vector.h"
 
 namespace blink {
+
 class GraphicsContext;
 class GraphicsLayer;
-}
-
-namespace blink {
 class PageOverlay;
 class WebPageOverlay;
 class WebViewImpl;
@@ -57,9 +55,9 @@ public:
     bool remove(WebPageOverlay*);
 
     void update();
-    void paintWebFrame(blink::GraphicsContext&);
+    void paintWebFrame(GraphicsContext&);
 
-    size_t findGraphicsLayer(blink::GraphicsLayer*);
+    size_t findGraphicsLayer(GraphicsLayer*);
 
 private:
     typedef Vector<OwnPtr<PageOverlay>, 2> PageOverlays;

third_party/WebKit/Source/web/PageScaleConstraintsSet.h

@@ -44,26 +44,26 @@ class PageScaleConstraintsSet {
 public:
     PageScaleConstraintsSet();
 
-    blink::PageScaleConstraints defaultConstraints() const;
+    PageScaleConstraints defaultConstraints() const;
 
     // Settings defined in the website's viewport tag, if viewport tag support
     // is enabled.
-    const blink::PageScaleConstraints& pageDefinedConstraints() const { return m_pageDefinedConstraints; }
-    void updatePageDefinedConstraints(const blink::ViewportDescription&, blink::Length legacyFallbackWidth);
-    void adjustForAndroidWebViewQuirks(const blink::ViewportDescription&, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode, bool nonUserScalableQuirkEnabled);
+    const PageScaleConstraints& pageDefinedConstraints() const { return m_pageDefinedConstraints; }
+    void updatePageDefinedConstraints(const ViewportDescription&, Length legacyFallbackWidth);
+    void adjustForAndroidWebViewQuirks(const ViewportDescription&, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode, bool nonUserScalableQuirkEnabled);
 
     // Constraints may also be set from Chromium -- this overrides any
     // page-defined values.
-    const blink::PageScaleConstraints& userAgentConstraints() const { return m_userAgentConstraints; }
-    void setUserAgentConstraints(const blink::PageScaleConstraints&);
+    const PageScaleConstraints& userAgentConstraints() const { return m_userAgentConstraints; }
+    void setUserAgentConstraints(const PageScaleConstraints&);
 
     // Actual computed values, taking into account the above plus the current
     // viewport size and document width.
-    const blink::PageScaleConstraints& finalConstraints() const { return m_finalConstraints; }
+    const PageScaleConstraints& finalConstraints() const { return m_finalConstraints; }
     void computeFinalConstraints();
-    void adjustFinalConstraintsToContentsSize(blink::IntSize contentsSize, int nonOverlayScrollbarWidth);
+    void adjustFinalConstraintsToContentsSize(IntSize contentsSize, int nonOverlayScrollbarWidth);
 
-    void didChangeContentsSize(blink::IntSize contentsSize, float pageScaleFactor);
+    void didChangeContentsSize(IntSize contentsSize, float pageScaleFactor);
 
     // This should be set to true on each page load to note that the page scale
     // factor needs to be reset to its initial value.
@@ -73,19 +73,19 @@ public:
     // This is set when one of the inputs to finalConstraints changes.
     bool constraintsDirty() const { return m_constraintsDirty; }
 
-    void didChangeViewSize(const blink::IntSize&);
+    void didChangeViewSize(const IntSize&);
 
-    blink::IntSize mainFrameSize(const blink::IntSize& contentsSize) const;
+    IntSize mainFrameSize(const IntSize& contentsSize) const;
 
 private:
-    blink::PageScaleConstraints computeConstraintsStack() const;
+    PageScaleConstraints computeConstraintsStack() const;
 
-    blink::PageScaleConstraints m_pageDefinedConstraints;
-    blink::PageScaleConstraints m_userAgentConstraints;
-    blink::PageScaleConstraints m_finalConstraints;
+    PageScaleConstraints m_pageDefinedConstraints;
+    PageScaleConstraints m_userAgentConstraints;
+    PageScaleConstraints m_finalConstraints;
 
     int m_lastContentsWidth;
-    blink::IntSize m_viewSize;
+    IntSize m_viewSize;
 
     bool m_needsReset;
     bool m_constraintsDirty;

third_party/WebKit/Source/web/PageWidgetDelegate.h

@@ -36,12 +36,9 @@
 #include "wtf/OwnPtr.h"
 
 namespace blink {
+
 class LocalFrame;
 class Page;
-}
-
-namespace blink {
-
 class PageOverlayList;
 class WebGestureEvent;
 class WebInputEvent;
@@ -52,15 +49,15 @@ class WebTouchEvent;
 
 class PageWidgetEventHandler {
 public:
-    virtual void handleMouseMove(blink::LocalFrame& mainFrame, const WebMouseEvent&);
-    virtual void handleMouseLeave(blink::LocalFrame& mainFrame, const WebMouseEvent&);
-    virtual void handleMouseDown(blink::LocalFrame& mainFrame, const WebMouseEvent&);
-    virtual void handleMouseUp(blink::LocalFrame& mainFrame, const WebMouseEvent&);
-    virtual bool handleMouseWheel(blink::LocalFrame& mainFrame, const WebMouseWheelEvent&);
+    virtual void handleMouseMove(LocalFrame& mainFrame, const WebMouseEvent&);
+    virtual void handleMouseLeave(LocalFrame& mainFrame, const WebMouseEvent&);
+    virtual void handleMouseDown(LocalFrame& mainFrame, const WebMouseEvent&);
+    virtual void handleMouseUp(LocalFrame& mainFrame, const WebMouseEvent&);
+    virtual bool handleMouseWheel(LocalFrame& mainFrame, const WebMouseWheelEvent&);
     virtual bool handleKeyEvent(const WebKeyboardEvent&) = 0;
     virtual bool handleCharEvent(const WebKeyboardEvent&) = 0;
     virtual bool handleGestureEvent(const WebGestureEvent&) = 0;
-    virtual bool handleTouchEvent(blink::LocalFrame& mainFrame, const WebTouchEvent&);
+    virtual bool handleTouchEvent(LocalFrame& mainFrame, const WebTouchEvent&);
     virtual ~PageWidgetEventHandler() { }
 };
 
@@ -72,10 +69,10 @@ public:
         Opaque,
         Translucent,
     };
-    static void animate(blink::Page*, double monotonicFrameBeginTime);
-    static void layout(blink::Page*, blink::LocalFrame* rootFrame = 0);
-    static void paint(blink::Page*, PageOverlayList*, WebCanvas*, const WebRect&, CanvasBackground);
-    static bool handleInputEvent(blink::Page*, PageWidgetEventHandler&, const WebInputEvent&);
+    static void animate(Page*, double monotonicFrameBeginTime);
+    static void layout(Page*, LocalFrame* rootFrame = 0);
+    static void paint(Page*, PageOverlayList*, WebCanvas*, const WebRect&, CanvasBackground);
+    static bool handleInputEvent(Page*, PageWidgetEventHandler&, const WebInputEvent&);
 
 private:
     PageWidgetDelegate() { }

third_party/WebKit/Source/web/PrerendererClientImpl.h

@@ -36,23 +36,20 @@
 #include "wtf/Noncopyable.h"
 #include "wtf/PassRefPtr.h"
 
-namespace blink {
-class Prerender;
-}
-
 namespace blink {
 
+class Prerender;
 class WebPrerendererClient;
 
-class PrerendererClientImpl FINAL : public NoBaseWillBeGarbageCollected<PrerendererClientImpl>, public blink::PrerendererClient {
+class PrerendererClientImpl FINAL : public NoBaseWillBeGarbageCollected<PrerendererClientImpl>, public PrerendererClient {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PrerendererClientImpl);
     WTF_MAKE_NONCOPYABLE(PrerendererClientImpl);
 public:
     explicit PrerendererClientImpl(WebPrerendererClient*);
 
-    void willAddPrerender(blink::Prerender*) OVERRIDE;
+    void willAddPrerender(Prerender*) OVERRIDE;
 
-    virtual void trace(blink::Visitor* visitor) OVERRIDE { blink::PrerendererClient::trace(visitor); }
+    virtual void trace(Visitor* visitor) OVERRIDE { PrerendererClient::trace(visitor); }
 
 private:
     WebPrerendererClient* m_client;

third_party/WebKit/Source/web/RemoteFrameClient.h

@@ -11,20 +11,20 @@ namespace blink {
 
 class WebRemoteFrameImpl;
 
-class RemoteFrameClient : public blink::FrameClient {
+class RemoteFrameClient : public FrameClient {
 public:
     explicit RemoteFrameClient(WebRemoteFrameImpl*);
 
     // FrameClient overrides:
-    virtual blink::Frame* opener() const OVERRIDE;
-    virtual void setOpener(blink::Frame*) OVERRIDE;
-
-    virtual blink::Frame* parent() const OVERRIDE;
-    virtual blink::Frame* top() const OVERRIDE;
-    virtual blink::Frame* previousSibling() const OVERRIDE;
-    virtual blink::Frame* nextSibling() const OVERRIDE;
-    virtual blink::Frame* firstChild() const OVERRIDE;
-    virtual blink::Frame* lastChild() const OVERRIDE;
+    virtual Frame* opener() const OVERRIDE;
+    virtual void setOpener(Frame*) OVERRIDE;
+
+    virtual Frame* parent() const OVERRIDE;
+    virtual Frame* top() const OVERRIDE;
+    virtual Frame* previousSibling() const OVERRIDE;
+    virtual Frame* nextSibling() const OVERRIDE;
+    virtual Frame* firstChild() const OVERRIDE;
+    virtual Frame* lastChild() const OVERRIDE;
 
     WebRemoteFrameImpl* webFrame() const { return m_webFrame; }
 

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h

@@ -60,10 +60,10 @@ class WebServiceWorkerRequest;
 // WorkerGlobalScope.
 class ServiceWorkerGlobalScopeProxy FINAL
     : public WebServiceWorkerContextProxy
-    , public blink::WorkerReportingProxy {
+    , public WorkerReportingProxy {
     WTF_MAKE_NONCOPYABLE(ServiceWorkerGlobalScopeProxy);
 public:
-    static PassOwnPtr<ServiceWorkerGlobalScopeProxy> create(WebEmbeddedWorkerImpl&, blink::ExecutionContext&, WebServiceWorkerContextClient&);
+    static PassOwnPtr<ServiceWorkerGlobalScopeProxy> create(WebEmbeddedWorkerImpl&, ExecutionContext&, WebServiceWorkerContextClient&);
     virtual ~ServiceWorkerGlobalScopeProxy();
 
     // WebServiceWorkerContextProxy overrides:
@@ -79,20 +79,20 @@ public:
     virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE;
     virtual void postMessageToPageInspector(const String&) OVERRIDE;
     virtual void updateInspectorStateCookie(const String&) OVERRIDE;
-    virtual void workerGlobalScopeStarted(blink::WorkerGlobalScope*) OVERRIDE;
+    virtual void workerGlobalScopeStarted(WorkerGlobalScope*) OVERRIDE;
     virtual void workerGlobalScopeClosed() OVERRIDE;
     virtual void willDestroyWorkerGlobalScope() OVERRIDE;
     virtual void workerThreadTerminated() OVERRIDE;
 
 private:
-    ServiceWorkerGlobalScopeProxy(WebEmbeddedWorkerImpl&, blink::ExecutionContext&, WebServiceWorkerContextClient&);
+    ServiceWorkerGlobalScopeProxy(WebEmbeddedWorkerImpl&, ExecutionContext&, WebServiceWorkerContextClient&);
 
     WebEmbeddedWorkerImpl& m_embeddedWorker;
-    blink::ExecutionContext& m_executionContext;
+    ExecutionContext& m_executionContext;
 
     WebServiceWorkerContextClient& m_client;
 
-    blink::WorkerGlobalScope* m_workerGlobalScope;
+    WorkerGlobalScope* m_workerGlobalScope;
 };
 
 } // namespace blink

third_party/WebKit/Source/web/SpeechRecognitionClientProxy.h

@@ -37,7 +37,7 @@ namespace blink {
 class WebSpeechRecognizer;
 class WebString;
 
-class SpeechRecognitionClientProxy FINAL : public blink::SpeechRecognitionClient, public WebSpeechRecognizerClient {
+class SpeechRecognitionClientProxy FINAL : public SpeechRecognitionClient, public WebSpeechRecognizerClient {
 public:
     virtual ~SpeechRecognitionClientProxy();
 
@@ -45,10 +45,10 @@ public:
     // itself, but attempting to call start/stop/abort on it will crash.
     static PassOwnPtr<SpeechRecognitionClientProxy> create(WebSpeechRecognizer*);
 
-    // blink::SpeechRecognitionClient:
-    virtual void start(blink::SpeechRecognition*, const blink::SpeechGrammarList*, const String& lang, bool continuous, bool interimResults, unsigned long maxAlternatives) OVERRIDE;
-    virtual void stop(blink::SpeechRecognition*) OVERRIDE;
-    virtual void abort(blink::SpeechRecognition*) OVERRIDE;
+    // SpeechRecognitionClient:
+    virtual void start(SpeechRecognition*, const SpeechGrammarList*, const String& lang, bool continuous, bool interimResults, unsigned long maxAlternatives) OVERRIDE;
+    virtual void stop(SpeechRecognition*) OVERRIDE;
+    virtual void abort(SpeechRecognition*) OVERRIDE;
 
     // WebSpeechRecognizerClient:
     virtual void didStartAudio(const WebSpeechRecognitionHandle&) OVERRIDE;

third_party/WebKit/Source/web/UserMediaClientImpl.h

@@ -35,24 +35,21 @@
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
+
 class MediaDevicesRequest;
 class UserMediaRequest;
-}
-
-namespace blink {
-
 class WebUserMediaClient;
 class WebLocalFrameImpl;
 
-class UserMediaClientImpl FINAL : public blink::UserMediaClient {
+class UserMediaClientImpl FINAL : public UserMediaClient {
 public:
     explicit UserMediaClientImpl(WebLocalFrameImpl*);
 
-    // blink::UserMediaClient ----------------------------------------------
-    virtual void requestUserMedia(blink::UserMediaRequest*) OVERRIDE;
-    virtual void cancelUserMediaRequest(blink::UserMediaRequest*) OVERRIDE;
-    virtual void requestMediaDevices(blink::MediaDevicesRequest*) OVERRIDE;
-    virtual void cancelMediaDevicesRequest(blink::MediaDevicesRequest*) OVERRIDE;
+    // UserMediaClient ----------------------------------------------
+    virtual void requestUserMedia(UserMediaRequest*) OVERRIDE;
+    virtual void cancelUserMediaRequest(UserMediaRequest*) OVERRIDE;
+    virtual void requestMediaDevices(MediaDevicesRequest*) OVERRIDE;
+    virtual void cancelMediaDevicesRequest(MediaDevicesRequest*) OVERRIDE;
 
 private:
     UserMediaClientImpl();

third_party/WebKit/Source/web/ValidationMessageClientImpl.h

@@ -32,40 +32,37 @@
 #include "platform/heap/Handle.h"
 #include "wtf/text/WTFString.h"
 
-namespace blink {
-class FrameView;
-}
-
 namespace blink {
 
+class FrameView;
 class WebViewImpl;
 
-class ValidationMessageClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<ValidationMessageClientImpl>, public blink::ValidationMessageClient {
+class ValidationMessageClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<ValidationMessageClientImpl>, public ValidationMessageClient {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ValidationMessageClientImpl);
 public:
     static PassOwnPtrWillBeRawPtr<ValidationMessageClientImpl> create(WebViewImpl&);
     virtual ~ValidationMessageClientImpl();
 
-    virtual void trace(blink::Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) OVERRIDE;
 
 private:
     ValidationMessageClientImpl(WebViewImpl&);
-    void checkAnchorStatus(blink::Timer<ValidationMessageClientImpl>*);
-    blink::FrameView* currentView();
+    void checkAnchorStatus(Timer<ValidationMessageClientImpl>*);
+    FrameView* currentView();
 
-    virtual void showValidationMessage(const blink::Element& anchor, const String& message, TextDirection messageDir, const String& subMessage, TextDirection subMessageDir) OVERRIDE;
-    virtual void hideValidationMessage(const blink::Element& anchor) OVERRIDE;
-    virtual bool isValidationMessageVisible(const blink::Element& anchor) OVERRIDE;
-    virtual void documentDetached(const blink::Document&) OVERRIDE;
+    virtual void showValidationMessage(const Element& anchor, const String& message, TextDirection messageDir, const String& subMessage, TextDirection subMessageDir) OVERRIDE;
+    virtual void hideValidationMessage(const Element& anchor) OVERRIDE;
+    virtual bool isValidationMessageVisible(const Element& anchor) OVERRIDE;
+    virtual void documentDetached(const Document&) OVERRIDE;
     virtual void willBeDestroyed() OVERRIDE;
 
     WebViewImpl& m_webView;
-    RawPtrWillBeMember<const blink::Element> m_currentAnchor;
+    RawPtrWillBeMember<const Element> m_currentAnchor;
     String m_message;
-    blink::IntRect m_lastAnchorRectInScreen;
+    IntRect m_lastAnchorRectInScreen;
     float m_lastPageScaleFactor;
     double m_finishTime;
-    blink::Timer<ValidationMessageClientImpl> m_timer;
+    Timer<ValidationMessageClientImpl> m_timer;
 };
 
 }

third_party/WebKit/Source/web/WebDevToolsFrontendImpl.h

@@ -44,8 +44,6 @@ class WebDevToolsClientDelegate;
 class WebViewImpl;
 struct WebDevToolsMessageData;
 
-using WTF::String;
-
 class WebDevToolsFrontendImpl FINAL : public WebDevToolsFrontend {
     WTF_MAKE_NONCOPYABLE(WebDevToolsFrontendImpl);
 public:

third_party/WebKit/Source/web/WebFileChooserCompletionImpl.h

@@ -37,10 +37,6 @@
 #include "public/web/WebFileChooserCompletion.h"
 #include "wtf/PassRefPtr.h"
 
-using blink::WebFileChooserCompletion;
-using blink::WebString;
-using blink::WebVector;
-
 namespace blink {
 
 class WebFileChooserCompletionImpl FINAL : public WebFileChooserCompletion {
@@ -49,6 +45,7 @@ public:
     virtual ~WebFileChooserCompletionImpl();
     virtual void didChooseFile(const WebVector<WebString>& fileNames) OVERRIDE;
     virtual void didChooseFile(const WebVector<SelectedFileInfo>& files) OVERRIDE;
+
 private:
     RefPtr<FileChooser> m_fileChooser;
 };

third_party/WebKit/Source/web/WorkerGlobalScopeProxyProviderImpl.h

@@ -36,13 +36,11 @@
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
+
 class Worker;
 class WorkerGlobalScopeProxy;
-}
-
-namespace blink {
 
-class WorkerGlobalScopeProxyProviderImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<WorkerGlobalScopeProxyProviderImpl>, public blink::WorkerGlobalScopeProxyProvider {
+class WorkerGlobalScopeProxyProviderImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<WorkerGlobalScopeProxyProviderImpl>, public WorkerGlobalScopeProxyProvider {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScopeProxyProviderImpl);
     WTF_MAKE_NONCOPYABLE(WorkerGlobalScopeProxyProviderImpl);
 public:
@@ -52,9 +50,9 @@ public:
     }
 
     virtual ~WorkerGlobalScopeProxyProviderImpl() { }
-    virtual blink::WorkerGlobalScopeProxy* createWorkerGlobalScopeProxy(blink::Worker*) OVERRIDE;
+    virtual WorkerGlobalScopeProxy* createWorkerGlobalScopeProxy(Worker*) OVERRIDE;
 
-    virtual void trace(blink::Visitor* visitor) OVERRIDE { blink::WorkerGlobalScopeProxyProvider::trace(visitor); }
+    virtual void trace(Visitor* visitor) OVERRIDE { WorkerGlobalScopeProxyProvider::trace(visitor); }
 
 private:
     WorkerGlobalScopeProxyProviderImpl() { }

third_party/WebKit/Source/web/WorkerPermissionClient.h

@@ -34,22 +34,18 @@
 #include "core/workers/WorkerClients.h"
 #include "wtf/Forward.h"
 
-namespace blink {
-class ExecutionContext;
-}
-
 namespace blink {
 
+class ExecutionContext;
 class WebFrame;
 class WebPermissionCallbacks;
 class WebString;
 class WebWorkerPermissionClientProxy;
 
-class WorkerPermissionClient FINAL : public NoBaseWillBeGarbageCollectedFinalized<WorkerPermissionClient>, public WillBeHeapSupplement<blink::WorkerClients> {
+class WorkerPermissionClient FINAL : public NoBaseWillBeGarbageCollectedFinalized<WorkerPermissionClient>, public WillBeHeapSupplement<WorkerClients> {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerPermissionClient);
 public:
     static PassOwnPtrWillBeRawPtr<WorkerPermissionClient> create(PassOwnPtr<WebWorkerPermissionClientProxy>);
-
     virtual ~WorkerPermissionClient();
 
     bool allowDatabase(const WebString& name, const WebString& displayName, unsigned long estimatedSize);
@@ -57,9 +53,9 @@ public:
     bool allowIndexedDB(const WebString& name);
 
     static const char* supplementName();
-    static WorkerPermissionClient* from(blink::ExecutionContext&);
+    static WorkerPermissionClient* from(ExecutionContext&);
 
-    virtual void trace(blink::Visitor* visitor) OVERRIDE { WillBeHeapSupplement<blink::WorkerClients>::trace(visitor); }
+    virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<WorkerClients>::trace(visitor); }
 
 private:
     explicit WorkerPermissionClient(PassOwnPtr<WebWorkerPermissionClientProxy>);
@@ -67,7 +63,7 @@ private:
     OwnPtr<WebWorkerPermissionClientProxy> m_proxy;
 };
 
-void providePermissionClientToWorker(blink::WorkerClients*, PassOwnPtr<WebWorkerPermissionClientProxy>);
+void providePermissionClientToWorker(WorkerClients*, PassOwnPtr<WebWorkerPermissionClientProxy>);
 
 } // namespace blink