Put chrome/ counterparts of WebView and MimeHandlerView under extensions/

namespace like other GuestViews.

This is a cleanup only CL.

Also, this CL removes one extraneous "extensions::" namespace resolution
from ChromeExtensionOptionsGuestDelegate.

BUG=None
Test=Internal cleanup only, no visible change.

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

Cr-Commit-Position: refs/heads/master@{#300582}

chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc

@@ -22,7 +22,7 @@ ChromeExtensionOptionsGuestDelegate::~ChromeExtensionOptionsGuestDelegate() {
 }
 
 void ChromeExtensionOptionsGuestDelegate::DidInitialize() {
-  extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
+  ChromeExtensionWebContentsObserver::CreateForWebContents(
       extension_options_guest()->web_contents());
 }
 

chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc

@@ -18,9 +18,11 @@
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
 
+namespace extensions {
+
 ChromeMimeHandlerViewGuestDelegate::ChromeMimeHandlerViewGuestDelegate(
-    extensions::MimeHandlerViewGuest* guest)
-    : extensions::MimeHandlerViewGuestDelegate(guest), guest_(guest) {
+    MimeHandlerViewGuest* guest)
+    : MimeHandlerViewGuestDelegate(guest), guest_(guest) {
 }
 
 ChromeMimeHandlerViewGuestDelegate::~ChromeMimeHandlerViewGuestDelegate() {
@@ -50,3 +52,5 @@ void ChromeMimeHandlerViewGuestDelegate::ChangeZoom(bool zoom_in) {
       guest_->embedder_web_contents(),
       zoom_in ? content::PAGE_ZOOM_IN : content::PAGE_ZOOM_OUT);
 }
+
+}  // namespace extensions

chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.h

@@ -11,11 +11,11 @@ namespace content {
 class WebContents;
 }  // namespace content
 
-class ChromeMimeHandlerViewGuestDelegate
-    : public extensions::MimeHandlerViewGuestDelegate {
+namespace extensions {
+
+class ChromeMimeHandlerViewGuestDelegate : public MimeHandlerViewGuestDelegate {
  public:
-  explicit ChromeMimeHandlerViewGuestDelegate(
-      extensions::MimeHandlerViewGuest* guest);
+  explicit ChromeMimeHandlerViewGuestDelegate(MimeHandlerViewGuest* guest);
   ~ChromeMimeHandlerViewGuestDelegate() override;
 
   // MimeHandlerViewGuestDelegate.
@@ -23,9 +23,11 @@ class ChromeMimeHandlerViewGuestDelegate
   void ChangeZoom(bool zoom_in) override;
 
  private:
-  extensions::MimeHandlerViewGuest* guest_;  // Owns us.
+  MimeHandlerViewGuest* guest_;  // Owns us.
 
   DISALLOW_COPY_AND_ASSIGN(ChromeMimeHandlerViewGuestDelegate);
 };
 
+}  // namespace extensions
+
 #endif  // CHROME_BROWSER_GUEST_VIEW_MIME_HANDLER_VIEW_CHROME_MIME_HANDLER_VIEW_GUEST_DELEGATE_H_

chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

@@ -26,8 +26,10 @@
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
 
+namespace extensions {
+
 ChromeWebViewGuestDelegate::ChromeWebViewGuestDelegate(
-    extensions::WebViewGuest* web_view_guest)
+    WebViewGuest* web_view_guest)
     : pending_context_menu_request_id_(0),
       chromevox_injected_(false),
       current_zoom_factor_(1.0),
@@ -58,8 +60,7 @@ bool ChromeWebViewGuestDelegate::HandleContextMenu(
   args->Set(webview::kContextMenuItems, items.release());
   args->SetInteger(webview::kRequestId, request_id);
   web_view_guest()->DispatchEventToEmbedder(
-      new extensions::GuestViewBase::Event(
-          webview::kEventContextMenu, args.Pass()));
+      new GuestViewBase::Event(webview::kEventContextMenu, args.Pass()));
   return true;
 }
 
@@ -76,8 +77,7 @@ void ChromeWebViewGuestDelegate::OnAttachWebViewHelpers(
   ZoomController::CreateForWebContents(contents);
 
   FaviconTabHelper::CreateForWebContents(contents);
-  extensions::ChromeExtensionWebContentsObserver::
-      CreateForWebContents(contents);
+  ChromeExtensionWebContentsObserver::CreateForWebContents(contents);
 #if defined(ENABLE_PRINTING)
 #if defined(ENABLE_FULL_PRINTING)
   printing::PrintViewManager::CreateForWebContents(contents);
@@ -144,9 +144,9 @@ void ChromeWebViewGuestDelegate::OnGuestReady() {
 
 void ChromeWebViewGuestDelegate::OnGuestDestroyed() {
   // Clean up custom context menu items for this guest.
-  extensions::MenuManager* menu_manager = extensions::MenuManager::Get(
+  MenuManager* menu_manager = MenuManager::Get(
       Profile::FromBrowserContext(web_view_guest()->browser_context()));
-  menu_manager->RemoveAllContextItems(extensions::MenuItem::ExtensionKey(
+  menu_manager->RemoveAllContextItems(MenuItem::ExtensionKey(
       web_view_guest()->embedder_extension_id(),
       web_view_guest()->view_instance_id()));
 }
@@ -178,8 +178,7 @@ void ChromeWebViewGuestDelegate::OnSetZoom(double zoom_factor) {
   args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_);
   args->SetDouble(webview::kNewZoomFactor, zoom_factor);
   web_view_guest()->DispatchEventToEmbedder(
-      new extensions::GuestViewBase::Event(
-          webview::kEventZoomChange, args.Pass()));
+      new GuestViewBase::Event(webview::kEventZoomChange, args.Pass()));
   current_zoom_factor_ = zoom_factor;
 }
 
@@ -235,3 +234,5 @@ void ChromeWebViewGuestDelegate::OnZoomChanged(
   ZoomController::FromWebContents(guest_web_contents())->
       SetZoomLevel(data.new_zoom_level);
 }
+
+}  // namespace extensions

chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h

@@ -20,11 +20,12 @@ namespace ui {
 class SimpleMenuModel;
 }  // namespace ui
 
-class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate,
+namespace extensions {
+
+class ChromeWebViewGuestDelegate : public WebViewGuestDelegate,
                                    public ZoomObserver {
  public :
-  explicit ChromeWebViewGuestDelegate(
-      extensions::WebViewGuest* web_view_guest);
+  explicit ChromeWebViewGuestDelegate(WebViewGuest* web_view_guest);
   ~ChromeWebViewGuestDelegate() override;
 
   // WebViewGuestDelegate implementation.
@@ -44,7 +45,7 @@ class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate,
   // ZoomObserver implementation.
   void OnZoomChanged(const ZoomController::ZoomChangedEventData& data) override;
 
-  extensions::WebViewGuest* web_view_guest() const { return web_view_guest_; }
+  WebViewGuest* web_view_guest() const { return web_view_guest_; }
 
  private:
   content::WebContents* guest_web_contents() const {
@@ -83,7 +84,7 @@ class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate,
       accessibility_subscription_;
 #endif
 
-  extensions::WebViewGuest* const web_view_guest_;
+  WebViewGuest* const web_view_guest_;
 
   // This is used to ensure pending tasks will not fire after this object is
   // destroyed.
@@ -92,5 +93,7 @@ class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate,
   DISALLOW_COPY_AND_ASSIGN(ChromeWebViewGuestDelegate);
 };
 
+}  // namespace extensions
+
 #endif  // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_
 

chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

@@ -17,8 +17,10 @@
 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
 
+namespace extensions {
+
 ChromeWebViewPermissionHelperDelegate::ChromeWebViewPermissionHelperDelegate(
-    extensions::WebViewPermissionHelper* web_view_permission_helper)
+    WebViewPermissionHelper* web_view_permission_helper)
     : WebViewPermissionHelperDelegate(web_view_permission_helper),
       weak_factory_(this) {
 }
@@ -188,7 +190,7 @@ void ChromeWebViewPermissionHelperDelegate::RequestGeolocationPermission(
   // It is safe to hold an unretained pointer to
   // ChromeWebViewPermissionHelperDelegate because this callback is called from
   // ChromeWebViewPermissionHelperDelegate::SetPermission.
-  const extensions::WebViewPermissionHelper::PermissionResponseCallback
+  const WebViewPermissionHelper::PermissionResponseCallback
       permission_callback =
       base::Bind(&ChromeWebViewPermissionHelperDelegate::
                      OnGeolocationPermissionResponse,
@@ -346,3 +348,5 @@ void ChromeWebViewPermissionHelperDelegate::FileSystemAccessedSyncResponse(
                                                                   allowed);
   Send(reply_msg);
 }
+
+}  // namespace extensions

chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h

@@ -10,13 +10,12 @@
 
 namespace extensions {
 class WebViewGuest;
-}
 
 class ChromeWebViewPermissionHelperDelegate :
-  public extensions::WebViewPermissionHelperDelegate {
+  public WebViewPermissionHelperDelegate {
  public:
   explicit ChromeWebViewPermissionHelperDelegate(
-      extensions::WebViewPermissionHelper* web_view_permission_helper);
+      WebViewPermissionHelper* web_view_permission_helper);
   ~ChromeWebViewPermissionHelperDelegate() override;
 
   // WebViewPermissionHelperDelegate implementation.
@@ -115,7 +114,7 @@ class ChromeWebViewPermissionHelperDelegate :
                                       IPC::Message* reply_msg,
                                       bool allowed);
 
-  extensions::WebViewGuest* web_view_guest() {
+  WebViewGuest* web_view_guest() {
     return web_view_permission_helper()->web_view_guest();
   }
 
@@ -126,4 +125,6 @@ class ChromeWebViewPermissionHelperDelegate :
   DISALLOW_COPY_AND_ASSIGN(ChromeWebViewPermissionHelperDelegate);
 };
 
+}  // namespace extensions
+
 #endif  // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_PERMISSION_HELPER_DELEGATE_H_