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

Unified Diff: mandoline/ui/aura/native_widget_view_manager.h

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « mandoline/ui/aura/input_method_mandoline.cc ('k') | mandoline/ui/aura/native_widget_view_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/aura/native_widget_view_manager.h
diff --git a/mandoline/ui/aura/native_widget_view_manager.h b/mandoline/ui/aura/native_widget_view_manager.h
index 22cce85998936292e3c22cc4d4bed9229da5e872..83fb556abedd8e2fe0d1e0dbec517830a818b78d 100644
--- a/mandoline/ui/aura/native_widget_view_manager.h
+++ b/mandoline/ui/aura/native_widget_view_manager.h
@@ -33,11 +33,11 @@
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 @@
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_;
« no previous file with comments | « mandoline/ui/aura/input_method_mandoline.cc ('k') | mandoline/ui/aura/native_widget_view_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698