| Index: mojo/services/html_viewer/html_document_view.h
|
| diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h
|
| index a6027e6c606963ab1ed0a67b73644d1192779c62..af315bb75fb25c9e3f1b13abd0c016eb25d27d14 100644
|
| --- a/mojo/services/html_viewer/html_document_view.h
|
| +++ b/mojo/services/html_viewer/html_document_view.h
|
| @@ -8,7 +8,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "mojo/public/cpp/application/lazy_interface_ptr.h"
|
| -#include "mojo/services/public/cpp/view_manager/node_observer.h"
|
| +#include "mojo/services/public/cpp/view_manager/view_observer.h"
|
| #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
|
| #include "mojo/services/public/interfaces/network/url_loader.mojom.h"
|
| #include "third_party/WebKit/public/web/WebFrameClient.h"
|
| @@ -16,20 +16,19 @@
|
|
|
| namespace mojo {
|
|
|
| -class Node;
|
| class ViewManager;
|
| class View;
|
|
|
| // A view for a single HTML document.
|
| class HTMLDocumentView : public blink::WebViewClient,
|
| public blink::WebFrameClient,
|
| - public NodeObserver {
|
| + public ViewObserver {
|
| public:
|
| HTMLDocumentView(ServiceProvider* service_provider,
|
| ViewManager* view_manager);
|
| virtual ~HTMLDocumentView();
|
|
|
| - void AttachToNode(Node* node);
|
| + void AttachToView(View* view);
|
|
|
| void Load(URLResponsePtr response);
|
|
|
| @@ -57,19 +56,19 @@ class HTMLDocumentView : public blink::WebViewClient,
|
| const blink::WebHistoryItem& history_item,
|
| blink::WebHistoryCommitType commit_type);
|
|
|
| - // NodeObserver methods:
|
| - virtual void OnNodeBoundsChanged(Node* node,
|
| + // ViewObserver methods:
|
| + virtual void OnViewBoundsChanged(View* view,
|
| const gfx::Rect& old_bounds,
|
| const gfx::Rect& new_bounds) OVERRIDE;
|
| - virtual void OnNodeDestroyed(Node* node) OVERRIDE;
|
| - virtual void OnNodeInputEvent(Node* node, const EventPtr& event) OVERRIDE;
|
| + virtual void OnViewDestroyed(View* view) OVERRIDE;
|
| + virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE;
|
|
|
| void Repaint();
|
|
|
| ViewManager* view_manager_;
|
| View* view_;
|
| blink::WebView* web_view_;
|
| - Node* root_;
|
| + View* root_;
|
| bool repaint_pending_;
|
| LazyInterfacePtr<NavigatorHost> navigator_host_;
|
|
|
|
|