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

Unified Diff: sky/viewer/document_view.h

Issue 1222483002: Remove the ability to load ".sky" files (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
Index: sky/viewer/document_view.h
diff --git a/sky/viewer/document_view.h b/sky/viewer/document_view.h
index c2dc6c5ae77bb0417818e027ab571f500aa95a98..9a9a5eb81ee0e29c7e479281865a43817a5defc4 100644
--- a/sky/viewer/document_view.h
+++ b/sky/viewer/document_view.h
@@ -22,8 +22,6 @@
#include "sky/engine/public/platform/ServiceProvider.h"
#include "sky/engine/public/sky/sky_view.h"
#include "sky/engine/public/sky/sky_view_client.h"
-#include "sky/engine/public/web/WebFrameClient.h"
-#include "sky/engine/public/web/WebViewClient.h"
#include "sky/services/testing/test_harness.mojom.h"
#include "sky/viewer/compositor/layer_client.h"
#include "sky/viewer/compositor/layer_host_client.h"
@@ -42,8 +40,6 @@ class LayerHost;
class DartLibraryProviderImpl;
class DocumentView : public blink::ServiceProvider,
- public blink::WebFrameClient,
- public blink::WebViewClient,
public blink::SkyViewClient,
public mojo::ViewManagerDelegate,
public mojo::ViewObserver,
@@ -59,8 +55,6 @@ class DocumentView : public blink::ServiceProvider,
base::WeakPtr<DocumentView> GetWeakPtr();
- blink::WebView* web_view() const { return web_view_; }
-
mojo::Shell* shell() const { return shell_; }
// sky::LayerHostClient
@@ -83,30 +77,9 @@ class DocumentView : public blink::ServiceProvider,
mojo::ScopedMessagePipeHandle TakeServiceRegistry();
private:
- // WebViewClient methods:
- void initializeLayerTreeView() override;
- void scheduleVisualUpdate() override;
- blink::WebScreenInfo screenInfo() override;
-
- // WebFrameClient methods:
- mojo::View* createChildFrame() override;
- void frameDetached(blink::WebFrame*) override;
- blink::WebNavigationPolicy decidePolicyForNavigation(
- const blink::WebFrameClient::NavigationPolicyInfo& info) override;
- void didAddMessageToConsole(
- const blink::WebConsoleMessage& message,
- const blink::WebString& source_name,
- unsigned source_line,
- const blink::WebString& stack_trace) override;
- void didCreateIsolate(blink::WebLocalFrame* frame,
- Dart_Isolate isolate) override;
-
// SkyViewClient methods:
void DidCreateIsolate(Dart_Isolate isolate) override;
- // WebViewClient methods:
- blink::ServiceProvider* services() override;
-
// Services methods:
mojo::NavigatorHost* NavigatorHost() override;
@@ -146,7 +119,6 @@ class DocumentView : public blink::ServiceProvider,
TestHarnessPtr test_harness_;
mojo::NavigatorHostPtr navigator_host_;
std::unique_ptr<blink::SkyView> sky_view_;
- blink::WebView* web_view_;
mojo::View* root_;
mojo::ViewManagerClientFactory view_manager_client_factory_;
scoped_ptr<DartLibraryProviderImpl> library_provider_;

Powered by Google App Engine
This is Rietveld 408576698