Moves mandoline/tab into components/web_view part 2

This updates the namespaces

BUG=521186
TEST=none
R=ben@chromium.org
TBR=ben@chromium.org

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

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

18 files changed, 36 insertions, 55 deletions

diff --git a/components/web_view/frame.cc b/components/web_view/frame.cc
index 323cdeb..2a35e80 100644
--- a/components/web_view/frame.cc
+++ b/components/web_view/frame.cc
@@ -18,9 +18,9 @@
 
 using mojo::View;
 
-DECLARE_VIEW_PROPERTY_TYPE(mandoline::Frame*);
+DECLARE_VIEW_PROPERTY_TYPE(web_view::Frame*);
 
-namespace mandoline {
+namespace web_view {
 
 // Used to find the Frame associated with a View.
 DEFINE_LOCAL_VIEW_PROPERTY_KEY(Frame*, kFrame, nullptr);
@@ -469,7 +469,7 @@ void Frame::OnCreatedFrame(
                            client_properties.To<ClientPropertyMap>());
 }
 
-void Frame::RequestNavigate(mandoline::NavigationTargetType target_type,
+void Frame::RequestNavigate(NavigationTargetType target_type,
                             uint32_t target_frame_id,
                             mojo::URLRequestPtr request) {
   if (target_type == NAVIGATION_TARGET_TYPE_EXISTING_FRAME) {
@@ -491,4 +491,4 @@ void Frame::DidNavigateLocally(uint32_t frame_id, const mojo::String& url) {
   NOTIMPLEMENTED();
 }
 
-}  // namespace mandoline
+}  // namespace web_view
diff --git a/components/web_view/frame.h b/components/web_view/frame.h
index 13ae4ce..fa1cc41 100644
--- a/components/web_view/frame.h
+++ b/components/web_view/frame.h
@@ -14,7 +14,7 @@
 #include "components/web_view/public/interfaces/frame_tree.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 
-namespace mandoline {
+namespace web_view {
 
 class FrameTree;
 class FrameTreeClient;
@@ -240,6 +240,6 @@ class Frame : public mojo::ViewObserver, public FrameTreeServer {
   DISALLOW_COPY_AND_ASSIGN(Frame);
 };
 
-}  // namespace mandoline
+}  // namespace web_view
 
 #endif  // COMPONENTS_WEB_VIEW_FRAME_H_
diff --git a/components/web_view/frame_apptest.cc b/components/web_view/frame_apptest.cc
index 9dd17b9..8fb2357 100644
--- a/components/web_view/frame_apptest.cc
+++ b/components/web_view/frame_apptest.cc
@@ -28,7 +28,7 @@
 using mojo::View;
 using mojo::ViewTreeConnection;
 
-namespace mandoline {
+namespace web_view {
 
 namespace {
 
@@ -214,4 +214,4 @@ TEST_F(FrameTest, SingleChild) {
   EXPECT_EQ(1u, root_client.adds().size());
 }
 
-}  // namespace mandoline
+}  // namespace web_view
diff --git a/components/web_view/frame_connection.cc b/components/web_view/frame_connection.cc
index 2f49f0c..9d91ea5 100644
--- a/components/web_view/frame_connection.cc
+++ b/components/web_view/frame_connection.cc
@@ -22,7 +22,7 @@
 #include "components/font_service/public/interfaces/font_service.mojom.h"
 #endif
 
-namespace mandoline {
+namespace web_view {
 namespace {
 
 // Callback from when the content handler id is obtained.
@@ -125,4 +125,4 @@ uint32_t FrameConnection::GetContentHandlerID() const {
   return content_handler_id;
 }
 
-}  // namespace mandoline
+}  // namespace web_view
diff --git a/components/web_view/frame_connection.h b/components/web_view/frame_connection.h
index 43dc928..bc7a422 100644
--- a/components/web_view/frame_connection.h
+++ b/components/web_view/frame_connection.h
@@ -19,7 +19,7 @@ class ApplicationConnection;
 class ApplicationImpl;
 }
 
-namespace mandoline {
+namespace web_view {
 
 class Frame;
 
@@ -69,6 +69,6 @@ class FrameConnection : public FrameUserData {
   DISALLOW_COPY_AND_ASSIGN(FrameConnection);
 };
 
-}  // namespace mandoline
+}  // namespace web_view
 
 #endif  // COMPONENTS_WEB_VIEW_FRAME_CONNECTION_H_
diff --git a/components/web_view/frame_devtools_agent.cc b/components/web_view/frame_devtools_agent.cc
index e94bb4f..b11a946 100644
--- a/components/web_view/frame_devtools_agent.cc
+++ b/components/web_view/frame_devtools_agent.cc
@@ -99,7 +99,7 @@ FrameDevToolsAgent::~FrameDevToolsAgent() {}
 
 void FrameDevToolsAgent::AttachFrame(
     DevToolsAgentPtr forward_agent,
-    mandoline::Frame::ClientPropertyMap* devtools_properties) {
+    Frame::ClientPropertyMap* devtools_properties) {
   RegisterAgentIfNecessary();
   forward_agent_ = forward_agent.Pass();
 
diff --git a/components/web_view/frame_devtools_agent.h b/components/web_view/frame_devtools_agent.h
index f0f89d3..53f8b6d 100644
--- a/components/web_view/frame_devtools_agent.h
+++ b/components/web_view/frame_devtools_agent.h
@@ -41,7 +41,7 @@ class FrameDevToolsAgent : public devtools_service::DevToolsAgent {
   // |devtools_properties|, which should be passed to the frame to initialize
   // its DevTools agent.
   void AttachFrame(devtools_service::DevToolsAgentPtr forward_agent,
-                   mandoline::Frame::ClientPropertyMap* devtools_properties);
+                   Frame::ClientPropertyMap* devtools_properties);
 
  private:
   class FrameDevToolsAgentClient;
diff --git a/components/web_view/frame_tree.cc b/components/web_view/frame_tree.cc
index c76d438..75c1b6f 100644
--- a/components/web_view/frame_tree.cc
+++ b/components/web_view/frame_tree.cc
@@ -9,7 +9,7 @@
 #include "components/web_view/frame_user_data.h"
 #include "components/web_view/web_view_switches.h"
 
-namespace mandoline {
+namespace web_view {
 
 FrameTree::FrameTree(uint32_t root_app_id,
                      mojo::View* view,
@@ -103,4 +103,4 @@ void FrameTree::ClientPropertyChanged(const Frame* source,
   root_.NotifyClientPropertyChanged(source, name, value);
 }
 
-}  // namespace mandoline
+}  // namespace web_view
diff --git a/components/web_view/frame_tree.h b/components/web_view/frame_tree.h
index 0eb2fac..971c633 100644
--- a/components/web_view/frame_tree.h
+++ b/components/web_view/frame_tree.h
@@ -12,7 +12,7 @@ namespace mojo {
 class String;
 }
 
-namespace mandoline {
+namespace web_view {
 
 class FrameTreeClient;
 class FrameTreeDelegate;
@@ -95,6 +95,6 @@ class FrameTree {
   DISALLOW_COPY_AND_ASSIGN(FrameTree);
 };
 
-}  // namespace mandoline
+}  // namespace web_view
 
 #endif  // COMPONENTS_WEB_VIEW_FRAME_TREE_H_
diff --git a/components/web_view/frame_tree_delegate.h b/components/web_view/frame_tree_delegate.h
index 24c73cf..06e7aad 100644
--- a/components/web_view/frame_tree_delegate.h
+++ b/components/web_view/frame_tree_delegate.h
@@ -13,7 +13,7 @@
 #include "components/web_view/public/interfaces/frame_tree.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 
-namespace mandoline {
+namespace web_view {
 
 class Frame;
 class FrameUserData;
@@ -62,6 +62,6 @@ class FrameTreeDelegate {
   virtual ~FrameTreeDelegate() {}
 };
 
-}  // namespace mandoline
+}  // namespace web_view
 
 #endif  // COMPONENTS_WEB_VIEW_FRAME_TREE_DELEGATE_H_
diff --git a/components/web_view/frame_user_data.h b/components/web_view/frame_user_data.h
index 6e3cb21..3ef7484 100644
--- a/components/web_view/frame_user_data.h
+++ b/components/web_view/frame_user_data.h
@@ -5,7 +5,7 @@
 #ifndef COMPONENTS_WEB_VIEW_FRAME_USER_DATA_H_
 #define COMPONENTS_WEB_VIEW_FRAME_USER_DATA_H_
 
-namespace mandoline {
+namespace web_view {
 
 // Arbitrary data that may be associated with each frame.
 class FrameUserData {
@@ -13,6 +13,6 @@ class FrameUserData {
   virtual ~FrameUserData() {}
 };
 
-}  // namespace mandoline
+}  // namespace web_view
 
 #endif  // COMPONENTS_WEB_VIEW_FRAME_USER_DATA_H_
diff --git a/components/web_view/pending_web_view_load.cc b/components/web_view/pending_web_view_load.cc
index 22dcd68..81fc341 100644
--- a/components/web_view/pending_web_view_load.cc
+++ b/components/web_view/pending_web_view_load.cc
@@ -9,8 +9,6 @@
 #include "components/web_view/frame_connection.h"
 #include "components/web_view/web_view_impl.h"
 
-using mandoline::FrameConnection;
-
 namespace web_view {
 
 PendingWebViewLoad::PendingWebViewLoad(WebViewImpl* web_view)
diff --git a/components/web_view/pending_web_view_load.h b/components/web_view/pending_web_view_load.h
index 72a94844..47bc831 100644
--- a/components/web_view/pending_web_view_load.h
+++ b/components/web_view/pending_web_view_load.h
@@ -8,12 +8,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 
-namespace mandoline {
-class FrameConnection;
-}
-
 namespace web_view {
 
+class FrameConnection;
 class WebViewImpl;
 
 // PendingWebViewLoad holds the state necessary to service a load of the main
@@ -25,7 +22,7 @@ class PendingWebViewLoad {
 
   void Init(mojo::URLRequestPtr request);
 
-  scoped_ptr<mandoline::FrameConnection> frame_connection() {
+  scoped_ptr<FrameConnection> frame_connection() {
     return frame_connection_.Pass();
   }
 
@@ -40,7 +37,7 @@ class PendingWebViewLoad {
 
   bool is_content_handler_id_valid_;
 
-  scoped_ptr<mandoline::FrameConnection> frame_connection_;
+  scoped_ptr<FrameConnection> frame_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(PendingWebViewLoad);
 };
diff --git a/components/web_view/public/interfaces/frame_tree.mojom b/components/web_view/public/interfaces/frame_tree.mojom
index 200eb9b..52b09b2 100644
--- a/components/web_view/public/interfaces/frame_tree.mojom
+++ b/components/web_view/public/interfaces/frame_tree.mojom
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-module mandoline;
+module web_view;
 
 import "network/public/interfaces/url_loader.mojom";
 
diff --git a/components/web_view/test_frame_tree_delegate.cc b/components/web_view/test_frame_tree_delegate.cc
index 9645643..ed0e1c1 100644
--- a/components/web_view/test_frame_tree_delegate.cc
+++ b/components/web_view/test_frame_tree_delegate.cc
@@ -4,7 +4,7 @@
 
 #include "components/web_view/test_frame_tree_delegate.h"
 
-namespace mandoline {
+namespace web_view {
 
 TestFrameTreeDelegate::TestFrameTreeDelegate() {}
 
@@ -31,4 +31,4 @@ void TestFrameTreeDelegate::CanNavigateFrame(
 
 void TestFrameTreeDelegate::DidStartNavigation(Frame* frame) {}
 
-}  // namespace mandoline
+}  // namespace web_view
diff --git a/components/web_view/test_frame_tree_delegate.h b/components/web_view/test_frame_tree_delegate.h
index ed5500f..249f6a5 100644
--- a/components/web_view/test_frame_tree_delegate.h
+++ b/components/web_view/test_frame_tree_delegate.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "components/web_view/frame_tree_delegate.h"
 
-namespace mandoline {
+namespace web_view {
 
 class TestFrameTreeDelegate : public FrameTreeDelegate {
  public:
@@ -31,6 +31,6 @@ class TestFrameTreeDelegate : public FrameTreeDelegate {
   DISALLOW_COPY_AND_ASSIGN(TestFrameTreeDelegate);
 };
 
-}  // namespace mandoline
+}  // namespace web_view
 
 #endif  // COMPONENTS_WEB_VIEW_TEST_FRAME_TREE_DELEGATE_H_
diff --git a/components/web_view/web_view_impl.cc b/components/web_view/web_view_impl.cc
index 91641a4..317e85f 100644
--- a/components/web_view/web_view_impl.cc
+++ b/components/web_view/web_view_impl.cc
@@ -18,12 +18,6 @@
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "url/gurl.h"
 
-// TODO(beng): remove once these classes are in the web_view namespace.
-using mandoline::FrameConnection;
-using mandoline::FrameTreeClient;
-using mandoline::FrameTreeDelegate;
-using mandoline::FrameUserData;
-
 namespace web_view {
 namespace {
 
@@ -137,7 +131,7 @@ void WebViewImpl::OnViewDestroyed(mojo::View* view) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// WebViewImpl, mandoline::FrameTreeDelegate implementation:
+// WebViewImpl, FrameTreeDelegate implementation:
 
 bool WebViewImpl::CanPostMessageEventToFrame(const Frame* source,
                                              const Frame* target,
diff --git a/components/web_view/web_view_impl.h b/components/web_view/web_view_impl.h
index 7735975..7a33cd7 100644
--- a/components/web_view/web_view_impl.h
+++ b/components/web_view/web_view_impl.h
@@ -14,30 +14,22 @@
 #include "components/web_view/public/interfaces/web_view.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
-namespace mandoline {
-class Frame;
-class FrameTree;
-class HTMLMessageEvent;
-}
-
 namespace mojo {
 class ApplicationImpl;
 }
 
-// TODO(beng): remove once these classes are in the web_view namespace.
-using mandoline::Frame;
-using mandoline::FrameTree;
-using mandoline::HTMLMessageEvent;
-
 namespace web_view {
 
+class Frame;
+class FrameTree;
 class FrameDevToolsAgent;
+class HTMLMessageEvent;
 class PendingWebViewLoad;
 
 class WebViewImpl : public mojom::WebView,
                     public mojo::ViewTreeDelegate,
                     public mojo::ViewObserver,
-                    public mandoline::FrameTreeDelegate,
+                    public FrameTreeDelegate,
                     public FrameDevToolsAgentDelegate {
  public:
   WebViewImpl(mojo::ApplicationImpl* app,
@@ -67,7 +59,7 @@ class WebViewImpl : public mojom::WebView,
                            const mojo::Rect& new_bounds) override;
   void OnViewDestroyed(mojo::View* view) override;
 
-  // Overridden from mandoline::FrameTreeDelegate:
+  // Overridden from FrameTreeDelegate:
   bool CanPostMessageEventToFrame(const Frame* source,
                                   const Frame* target,
                                   HTMLMessageEvent* event) override;