Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1107)

Unified Diff: Source/web/ExternalPopupMenu.h

Issue 462613002: Cleanup namespace usage in Source/web/[A-V]*.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/ExternalPopupMenu.h
diff --git a/Source/web/ExternalPopupMenu.h b/Source/web/ExternalPopupMenu.h
index 22089ef6bdb553a2cb8c3c2ec9ac8c8f6cfd48dc..893cf0b6c5031ba200b075f3121a732c5d16b9ea 100644
--- a/Source/web/ExternalPopupMenu.h
+++ b/Source/web/ExternalPopupMenu.h
@@ -38,16 +38,13 @@
#include "public/web/WebExternalPopupMenuClient.h"
namespace blink {
+
class FloatQuad;
class LocalFrame;
class FrameView;
class IntRect;
class IntSize;
class PopupMenuClient;
-}
-
-namespace blink {
-
class WebExternalPopupMenu;
class WebViewImpl;
struct WebPopupMenuInfo;
@@ -55,14 +52,14 @@ class WebMouseEvent;
// The ExternalPopupMenu connects the actual implementation of the popup menu
// to the WebCore popup menu.
-class ExternalPopupMenu FINAL : public blink::PopupMenu, public WebExternalPopupMenuClient {
+class ExternalPopupMenu FINAL : public PopupMenu, public WebExternalPopupMenuClient {
public:
- ExternalPopupMenu(blink::LocalFrame&, blink::PopupMenuClient*, WebViewImpl&);
+ ExternalPopupMenu(LocalFrame&, PopupMenuClient*, WebViewImpl&);
virtual ~ExternalPopupMenu();
private:
- // blink::PopupMenu methods:
- virtual void show(const blink::FloatQuad& controlPosition, const blink::IntSize&, int index) OVERRIDE;
+ // PopupMenu methods:
+ virtual void show(const FloatQuad& controlPosition, const IntSize&, int index) OVERRIDE;
virtual void hide() OVERRIDE;
virtual void updateFromElement() OVERRIDE;
virtual void disconnectClient() OVERRIDE;
@@ -73,18 +70,18 @@ private:
virtual void didAcceptIndices(const WebVector<int>& indices) OVERRIDE;
virtual void didCancel() OVERRIDE;
- void dispatchEvent(blink::Timer<ExternalPopupMenu>*);
+ void dispatchEvent(Timer<ExternalPopupMenu>*);
// Fills |info| with the popup menu information contained in the
- // blink::PopupMenuClient associated with this ExternalPopupMenu.
+ // PopupMenuClient associated with this ExternalPopupMenu.
void getPopupMenuInfo(WebPopupMenuInfo* info);
int toPopupMenuItemIndex(int index);
int toExternalPopupMenuItemIndex(int index);
- blink::PopupMenuClient* m_popupMenuClient;
- RefPtr<blink::FrameView> m_frameView;
+ PopupMenuClient* m_popupMenuClient;
+ RefPtr<FrameView> m_frameView;
WebViewImpl& m_webView;
OwnPtr<WebMouseEvent> m_syntheticEvent;
- blink::Timer<ExternalPopupMenu> m_dispatchEventTimer;
+ Timer<ExternalPopupMenu> m_dispatchEventTimer;
// The actual implementor of the show menu.
WebExternalPopupMenu* m_webExternalPopupMenu;
};

Powered by Google App Engine
This is Rietveld 408576698