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

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

Issue 957973003: Fix sky shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | sky/shell/ui/engine.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 blink::WebScreenInfo screenInfo() override; 66 blink::WebScreenInfo screenInfo() override;
67 blink::ServiceProvider* services() override; 67 blink::ServiceProvider* services() override;
68 68
69 // Services methods: 69 // Services methods:
70 mojo::NavigatorHost* NavigatorHost() override; 70 mojo::NavigatorHost* NavigatorHost() override;
71 71
72 // NavigatorHost methods: 72 // NavigatorHost methods:
73 void RequestNavigate(mojo::Target target, 73 void RequestNavigate(mojo::Target target,
74 mojo::URLRequestPtr request) override; 74 mojo::URLRequestPtr request) override;
75 void DidNavigateLocally(const mojo::String& url) override; 75 void DidNavigateLocally(const mojo::String& url) override;
76 void RequestNavigateHistory(int32_t delta) override;
76 77
77 void UpdateWebViewSize(); 78 void UpdateWebViewSize();
78 79
79 scoped_ptr<PlatformImpl> platform_impl_; 80 scoped_ptr<PlatformImpl> platform_impl_;
80 scoped_ptr<Animator> animator_; 81 scoped_ptr<Animator> animator_;
81 blink::WebView* web_view_; 82 blink::WebView* web_view_;
82 float device_pixel_ratio_; 83 float device_pixel_ratio_;
83 gfx::Size physical_size_; 84 gfx::Size physical_size_;
84 mojo::Binding<ViewportObserver> viewport_observer_binding_; 85 mojo::Binding<ViewportObserver> viewport_observer_binding_;
85 86
86 base::WeakPtrFactory<Engine> weak_factory_; 87 base::WeakPtrFactory<Engine> weak_factory_;
87 88
88 DISALLOW_COPY_AND_ASSIGN(Engine); 89 DISALLOW_COPY_AND_ASSIGN(Engine);
89 }; 90 };
90 91
91 } // namespace shell 92 } // namespace shell
92 } // namespace sky 93 } // namespace sky
93 94
94 #endif // SKY_SHELL_UI_ENGINE_H_ 95 #endif // SKY_SHELL_UI_ENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | sky/shell/ui/engine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698