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_VIEWER_DOCUMENT_VIEW_H_ | 5 #ifndef SKY_VIEWER_DOCUMENT_VIEW_H_ |
6 #define SKY_VIEWER_DOCUMENT_VIEW_H_ | 6 #define SKY_VIEWER_DOCUMENT_VIEW_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "mojo/public/cpp/application/lazy_interface_ptr.h" | 10 #include "mojo/public/cpp/application/lazy_interface_ptr.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 private: | 62 private: |
63 // Application methods: | 63 // Application methods: |
64 void AcceptConnection(const mojo::String& requestor_url, | 64 void AcceptConnection(const mojo::String& requestor_url, |
65 mojo::ServiceProviderPtr provider) override; | 65 mojo::ServiceProviderPtr provider) override; |
66 void Initialize(mojo::Array<mojo::String> args) override; | 66 void Initialize(mojo::Array<mojo::String> args) override; |
67 | 67 |
68 // WebWidgetClient methods: | 68 // WebWidgetClient methods: |
69 virtual blink::WebLayerTreeView* initializeLayerTreeView(); | 69 virtual blink::WebLayerTreeView* initializeLayerTreeView(); |
70 | 70 |
71 // WebFrameClient methods: | 71 // WebFrameClient methods: |
| 72 void createChildView(const blink::WebURL&) override; |
72 void frameDetached(blink::WebFrame*) override; | 73 void frameDetached(blink::WebFrame*) override; |
73 blink::WebNavigationPolicy decidePolicyForNavigation( | 74 blink::WebNavigationPolicy decidePolicyForNavigation( |
74 const blink::WebFrameClient::NavigationPolicyInfo& info) override; | 75 const blink::WebFrameClient::NavigationPolicyInfo& info) override; |
75 void didAddMessageToConsole( | 76 void didAddMessageToConsole( |
76 const blink::WebConsoleMessage& message, | 77 const blink::WebConsoleMessage& message, |
77 const blink::WebString& source_name, | 78 const blink::WebString& source_name, |
78 unsigned source_line, | 79 unsigned source_line, |
79 const blink::WebString& stack_trace) override; | 80 const blink::WebString& stack_trace) override; |
80 void didCreateScriptContext( | 81 void didCreateScriptContext( |
81 blink::WebLocalFrame*, | 82 blink::WebLocalFrame*, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 scoped_refptr<base::MessageLoopProxy> compositor_thread_; | 120 scoped_refptr<base::MessageLoopProxy> compositor_thread_; |
120 scoped_ptr<ScriptRunner> script_runner_; | 121 scoped_ptr<ScriptRunner> script_runner_; |
121 | 122 |
122 base::WeakPtrFactory<DocumentView> weak_factory_; | 123 base::WeakPtrFactory<DocumentView> weak_factory_; |
123 DISALLOW_COPY_AND_ASSIGN(DocumentView); | 124 DISALLOW_COPY_AND_ASSIGN(DocumentView); |
124 }; | 125 }; |
125 | 126 |
126 } // namespace sky | 127 } // namespace sky |
127 | 128 |
128 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ | 129 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ |
OLD | NEW |