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

Unified Diff: mojo/views/native_widget_view_manager.h

Issue 460863002: Rename Node to View in the View Manager mojom & client lib. Service TBD. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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
Index: mojo/views/native_widget_view_manager.h
diff --git a/mojo/views/native_widget_view_manager.h b/mojo/views/native_widget_view_manager.h
index 1c3365260929e676ed8801ccc164dc340ecdd167..4865f0ef29b56887901e5984dd5a2a0cff907bed 100644
--- a/mojo/views/native_widget_view_manager.h
+++ b/mojo/views/native_widget_view_manager.h
@@ -6,7 +6,7 @@
#define MOJO_VIEWS_NATIVE_WIDGET_VIEW_MANAGER_H_
#include "mojo/aura/window_tree_host_mojo_delegate.h"
-#include "mojo/services/public/cpp/view_manager/node_observer.h"
+#include "mojo/services/public/cpp/view_manager/view_observer.h"
#include "ui/views/widget/native_widget_aura.h"
namespace ui {
@@ -26,10 +26,10 @@ class WindowTreeHostMojo;
class NativeWidgetViewManager : public views::NativeWidgetAura,
public WindowTreeHostMojoDelegate,
- public NodeObserver {
+ public ViewObserver {
public:
NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate,
- Node* node);
+ View* view);
virtual ~NativeWidgetViewManager();
private:
@@ -40,12 +40,12 @@ class NativeWidgetViewManager : public views::NativeWidgetAura,
// WindowTreeHostMojoDelegate:
virtual void CompositorContentsChanged(const SkBitmap& bitmap) OVERRIDE;
- // NodeObserver:
- virtual void OnNodeDestroyed(Node* node) OVERRIDE;
- virtual void OnNodeBoundsChanged(Node* node,
+ // ViewObserver:
+ virtual void OnViewDestroyed(View* view) OVERRIDE;
+ virtual void OnViewBoundsChanged(View* view,
const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) OVERRIDE;
- virtual void OnNodeInputEvent(Node* node, const EventPtr& event) OVERRIDE;
+ virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE;
scoped_ptr<WindowTreeHostMojo> window_tree_host_;
@@ -53,7 +53,7 @@ class NativeWidgetViewManager : public views::NativeWidgetAura,
scoped_ptr<ui::internal::InputMethodDelegate> ime_filter_;
- Node* node_;
+ View* view_;
scoped_ptr<wm::ScopedCaptureClient> capture_client_;
« no previous file with comments | « mojo/services/window_manager/window_manager_service_impl.cc ('k') | mojo/views/native_widget_view_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698