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

Side by Side Diff: sky/shell/ui/engine.h

Issue 1165003006: Various fixes in preparation for deploying (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove game changes 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_SHELL_UI_ENGINE_H_ 5 #ifndef SKY_SHELL_UI_ENGINE_H_
6 #define SKY_SHELL_UI_ENGINE_H_ 6 #define SKY_SHELL_UI_ENGINE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 // Services methods: 86 // Services methods:
87 mojo::NavigatorHost* NavigatorHost() override; 87 mojo::NavigatorHost* NavigatorHost() override;
88 88
89 // NavigatorHost methods: 89 // NavigatorHost methods:
90 void RequestNavigate(mojo::Target target, 90 void RequestNavigate(mojo::Target target,
91 mojo::URLRequestPtr request) override; 91 mojo::URLRequestPtr request) override;
92 void DidNavigateLocally(const mojo::String& url) override; 92 void DidNavigateLocally(const mojo::String& url) override;
93 void RequestNavigateHistory(int32_t delta) override; 93 void RequestNavigateHistory(int32_t delta) override;
94 94
95 void UpdateSkyViewSize();
95 void UpdateWebViewSize(); 96 void UpdateWebViewSize();
96 97
97 Config config_; 98 Config config_;
98 mojo::ServiceProviderPtr service_provider_; 99 mojo::ServiceProviderPtr service_provider_;
99 scoped_ptr<PlatformImpl> platform_impl_; 100 scoped_ptr<PlatformImpl> platform_impl_;
100 scoped_ptr<Animator> animator_; 101 scoped_ptr<Animator> animator_;
101 102
102 std::unique_ptr<blink::SkyView> sky_view_; 103 std::unique_ptr<blink::SkyView> sky_view_;
103 blink::WebView* web_view_; 104 blink::WebView* web_view_;
104 105
105 float device_pixel_ratio_; 106 float device_pixel_ratio_;
106 gfx::Size physical_size_; 107 gfx::Size physical_size_;
107 mojo::Binding<ViewportObserver> viewport_observer_binding_; 108 mojo::Binding<ViewportObserver> viewport_observer_binding_;
108 109
109 base::WeakPtrFactory<Engine> weak_factory_; 110 base::WeakPtrFactory<Engine> weak_factory_;
110 111
111 DISALLOW_COPY_AND_ASSIGN(Engine); 112 DISALLOW_COPY_AND_ASSIGN(Engine);
112 }; 113 };
113 114
114 } // namespace shell 115 } // namespace shell
115 } // namespace sky 116 } // namespace sky
116 117
117 #endif // SKY_SHELL_UI_ENGINE_H_ 118 #endif // SKY_SHELL_UI_ENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698