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

Unified Diff: mojo/views/native_widget_view_manager.h

Issue 341953002: Clean up WTH creation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 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 | « mojo/services/view_manager/screen_impl.cc ('k') | mojo/views/native_widget_view_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4f7114514ba4eed07407763edd63a73df8950cdb..5981200bc20ae0918380e90c1af09e7b8f56fa29 100644
--- a/mojo/views/native_widget_view_manager.h
+++ b/mojo/views/native_widget_view_manager.h
@@ -6,6 +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"
@@ -25,10 +26,11 @@ class WindowTreeHostMojo;
class NativeWidgetViewManager : public views::NativeWidgetAura,
public WindowTreeHostMojoDelegate,
- public view_manager::ViewObserver {
+ public view_manager::ViewObserver,
+ public view_manager::NodeObserver {
public:
NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate,
- view_manager::View* view);
+ view_manager::Node* node);
virtual ~NativeWidgetViewManager();
private:
@@ -49,7 +51,7 @@ class NativeWidgetViewManager : public views::NativeWidgetAura,
scoped_ptr<ui::internal::InputMethodDelegate> ime_filter_;
- view_manager::View* view_;
+ view_manager::Node* node_;
DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager);
};
« no previous file with comments | « mojo/services/view_manager/screen_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