diff options
author | thakis <thakis@chromium.org> | 2015-09-16 19:48:48 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-17 02:49:24 +0000 |
commit | 35b19f7d5d7b7b68878d6c766e93e148f8b06998 (patch) | |
tree | 546289030a5e80740af920e59ce31827d907bd2a /components/web_view/web_view_impl.h | |
parent | eef6f20ef572c4c128612384a63384aaa7d23fe7 (diff) | |
download | chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.zip chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.gz chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.bz2 |
Revert of Mandoline UI Process: Update namespaces and file names (patchset #9 id:150001 of https://codereview.chromium.org/1340983002/ )
Reason for revert:
Speculative, might've broken mojo_apptests on http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/32066
Original issue's description:
> Mandoline UI Process: Update namespaces and file names
>
> This CL updates namespaces in components/mus to mus from mojo, surfaces, gles2, and view_manager.
>
> BUG=531533
> TBR=jam@chromium.org for trivial pdf_viewer change.
>
> Committed: https://crrev.com/49b0d73f3ebb4801fc518751145504af3a2f70ed
> Cr-Commit-Position: refs/heads/master@{#349229}
TBR=sky@chromium.org,fsamuel@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=531533
Review URL: https://codereview.chromium.org/1351013002
Cr-Commit-Position: refs/heads/master@{#349332}
Diffstat (limited to 'components/web_view/web_view_impl.h')
-rw-r--r-- | components/web_view/web_view_impl.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/components/web_view/web_view_impl.h b/components/web_view/web_view_impl.h index fdde32a..b706f94 100644 --- a/components/web_view/web_view_impl.h +++ b/components/web_view/web_view_impl.h @@ -29,8 +29,8 @@ class PendingWebViewLoad; class URLRequestCloneable; class WebViewImpl : public mojom::WebView, - public mus::ViewTreeDelegate, - public mus::ViewObserver, + public mojo::ViewTreeDelegate, + public mojo::ViewObserver, public FrameTreeDelegate, public FrameDevToolsAgentDelegate { public: @@ -58,15 +58,15 @@ class WebViewImpl : public mojom::WebView, void GoBack() override; void GoForward() override; - // Overridden from mus::ViewTreeDelegate: - void OnEmbed(mus::View* root) override; - void OnConnectionLost(mus::ViewTreeConnection* connection) override; + // Overridden from mojo::ViewTreeDelegate: + void OnEmbed(mojo::View* root) override; + void OnConnectionLost(mojo::ViewTreeConnection* connection) override; - // Overridden from mus::ViewObserver: - void OnViewBoundsChanged(mus::View* view, + // Overridden from mojo::ViewObserver: + void OnViewBoundsChanged(mojo::View* view, const mojo::Rect& old_bounds, const mojo::Rect& new_bounds) override; - void OnViewDestroyed(mus::View* view) override; + void OnViewDestroyed(mojo::View* view) override; // Overridden from FrameTreeDelegate: bool CanPostMessageEventToFrame(const Frame* source, @@ -87,8 +87,8 @@ class WebViewImpl : public mojom::WebView, mojo::ApplicationImpl* app_; mojom::WebViewClientPtr client_; mojo::StrongBinding<WebView> binding_; - mus::View* root_; - mus::View* content_; + mojo::View* root_; + mojo::View* content_; scoped_ptr<FrameTree> frame_tree_; // When LoadRequest() is called a PendingWebViewLoad is created to wait for |