| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 | 59 |
| 60 mojo::Shell* shell() const { return shell_.get(); } | 60 mojo::Shell* shell() const { return shell_.get(); } |
| 61 | 61 |
| 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 blink::WebLayerTreeView* initializeLayerTreeView() override; |
| 70 void scheduleAnimation() override; |
| 70 | 71 |
| 71 // WebFrameClient methods: | 72 // WebFrameClient methods: |
| 72 mojo::View* createChildFrame(const blink::WebURL& url) override; | 73 mojo::View* createChildFrame(const blink::WebURL& url) override; |
| 73 void frameDetached(blink::WebFrame*) override; | 74 void frameDetached(blink::WebFrame*) override; |
| 74 blink::WebNavigationPolicy decidePolicyForNavigation( | 75 blink::WebNavigationPolicy decidePolicyForNavigation( |
| 75 const blink::WebFrameClient::NavigationPolicyInfo& info) override; | 76 const blink::WebFrameClient::NavigationPolicyInfo& info) override; |
| 76 void didAddMessageToConsole( | 77 void didAddMessageToConsole( |
| 77 const blink::WebConsoleMessage& message, | 78 const blink::WebConsoleMessage& message, |
| 78 const blink::WebString& source_name, | 79 const blink::WebString& source_name, |
| 79 unsigned source_line, | 80 unsigned source_line, |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 scoped_ptr<ScriptRunner> script_runner_; | 125 scoped_ptr<ScriptRunner> script_runner_; |
| 125 int debugger_id_; | 126 int debugger_id_; |
| 126 | 127 |
| 127 base::WeakPtrFactory<DocumentView> weak_factory_; | 128 base::WeakPtrFactory<DocumentView> weak_factory_; |
| 128 DISALLOW_COPY_AND_ASSIGN(DocumentView); | 129 DISALLOW_COPY_AND_ASSIGN(DocumentView); |
| 129 }; | 130 }; |
| 130 | 131 |
| 131 } // namespace sky | 132 } // namespace sky |
| 132 | 133 |
| 133 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ | 134 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ |
| OLD | NEW |