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 /mandoline/ui/aura/native_widget_view_manager.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 'mandoline/ui/aura/native_widget_view_manager.h')
-rw-r--r-- | mandoline/ui/aura/native_widget_view_manager.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mandoline/ui/aura/native_widget_view_manager.h b/mandoline/ui/aura/native_widget_view_manager.h index 22cce85..83fb556a 100644 --- a/mandoline/ui/aura/native_widget_view_manager.h +++ b/mandoline/ui/aura/native_widget_view_manager.h @@ -33,11 +33,11 @@ namespace mandoline { class WindowTreeHostMojo; class NativeWidgetViewManager : public views::NativeWidgetAura, - public mus::ViewObserver { + public mojo::ViewObserver { public: NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate, mojo::Shell* shell, - mus::View* view); + mojo::View* view); ~NativeWidgetViewManager() override; private: @@ -46,19 +46,19 @@ class NativeWidgetViewManager : public views::NativeWidgetAura, void OnWindowVisibilityChanged(aura::Window* window, bool visible) override; // ViewObserver: - void OnViewDestroyed(mus::View* view) override; - void OnViewBoundsChanged(mus::View* view, + void OnViewDestroyed(mojo::View* view) override; + void OnViewBoundsChanged(mojo::View* view, const mojo::Rect& old_bounds, const mojo::Rect& new_bounds) override; - void OnViewFocusChanged(mus::View* gained_focus, - mus::View* lost_focus) override; - void OnViewInputEvent(mus::View* view, const mojo::EventPtr& event) override; + void OnViewFocusChanged(mojo::View* gained_focus, + mojo::View* lost_focus) override; + void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override; scoped_ptr<WindowTreeHostMojo> window_tree_host_; scoped_ptr<wm::FocusController> focus_client_; - mus::View* view_; + mojo::View* view_; scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |