Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_ | 5 #ifndef SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_ |
| 6 #define SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_ | 6 #define SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_ |
| 7 | 7 |
| 8 #include "gen/sky/core/HTMLNames.h" | 8 #include "gen/sky/core/HTMLNames.h" |
| 9 #include "mojo/services/view_manager/public/cpp/view_observer.h" | 9 #include "mojo/services/view_manager/public/cpp/view_observer.h" |
| 10 #include "sky/engine/core/dom/DOMURLUtils.h" | 10 #include "sky/engine/core/dom/DOMURLUtils.h" |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 DEFINE_WRAPPERTYPEINFO(); | 21 DEFINE_WRAPPERTYPEINFO(); |
| 22 public: | 22 public: |
| 23 static PassRefPtr<HTMLIFrameElement> create(Document&); | 23 static PassRefPtr<HTMLIFrameElement> create(Document&); |
| 24 | 24 |
| 25 ~HTMLIFrameElement() override; | 25 ~HTMLIFrameElement() override; |
| 26 | 26 |
| 27 mojo::View* contentView() const { return m_contentView; } | 27 mojo::View* contentView() const { return m_contentView; } |
| 28 | 28 |
| 29 ScriptValue takeServicesHandle(ScriptState*); | 29 ScriptValue takeServicesHandle(ScriptState*); |
| 30 ScriptValue takeExposedServicesHandle(ScriptState*); | 30 ScriptValue takeExposedServicesHandle(ScriptState*); |
| 31 void embedViewManagerClient(blink::ScriptValue client); | |
|
abarth-chromium
2015/02/11 01:02:13
No need for blink::
also, const ScriptValue&
hansmuller1
2015/02/11 01:09:01
Done.
| |
| 31 | 32 |
| 32 private: | 33 private: |
| 33 explicit HTMLIFrameElement(Document&); | 34 explicit HTMLIFrameElement(Document&); |
| 34 | 35 |
| 35 // HTMLElement methods: | 36 // HTMLElement methods: |
| 36 RenderObject* createRenderer(RenderStyle* style) override; | 37 RenderObject* createRenderer(RenderStyle* style) override; |
| 37 | 38 |
| 38 void insertedInto(ContainerNode*) override; | 39 void insertedInto(ContainerNode*) override; |
| 39 void removedFrom(ContainerNode*) override; | 40 void removedFrom(ContainerNode*) override; |
| 40 void parseAttribute(const QualifiedName& name, const AtomicString& value) ov erride; | 41 void parseAttribute(const QualifiedName& name, const AtomicString& value) ov erride; |
| 41 | 42 |
| 42 // ViewObserver methods: | 43 // ViewObserver methods: |
| 43 void OnViewDestroyed(mojo::View* view) override; | 44 void OnViewDestroyed(mojo::View* view) override; |
| 44 | 45 |
| 45 void createView(); | 46 void createView(); |
| 46 void navigateView(); | 47 void navigateView(); |
| 47 | 48 |
| 48 mojo::View* m_contentView; | 49 mojo::View* m_contentView; |
| 49 mojo::ServiceProviderPtr m_services; | 50 mojo::ServiceProviderPtr m_services; |
| 50 mojo::ScopedMessagePipeHandle m_exposedServices; | 51 mojo::ScopedMessagePipeHandle m_exposedServices; |
| 51 }; | 52 }; |
| 52 | 53 |
| 53 } // namespace blink | 54 } // namespace blink |
| 54 | 55 |
| 55 #endif // SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_ | 56 #endif // SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_ |
| OLD | NEW |