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

Side by Side Diff: services/navigation/view_impl.h

Issue 2301353003: Changes ownership of WindowTreeClient (Closed)
Patch Set: fix navigation Created 4 years, 3 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 | « content/renderer/mus/compositor_mus_connection.cc ('k') | services/navigation/view_impl.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 SERVICES_NAVIGATION_VIEW_IMPL_H_ 5 #ifndef SERVICES_NAVIGATION_VIEW_IMPL_H_
6 #define SERVICES_NAVIGATION_VIEW_IMPL_H_ 6 #define SERVICES_NAVIGATION_VIEW_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 void UpdateTargetURL(content::WebContents* source, const GURL& url) override; 74 void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
75 gfx::Rect GetRootWindowResizerRect() const override; 75 gfx::Rect GetRootWindowResizerRect() const override;
76 76
77 // content::NotificationObserver: 77 // content::NotificationObserver:
78 void Observe(int type, 78 void Observe(int type,
79 const content::NotificationSource& source, 79 const content::NotificationSource& source,
80 const content::NotificationDetails& details) override; 80 const content::NotificationDetails& details) override;
81 81
82 // ui::WindowTreeClientDelegate: 82 // ui::WindowTreeClientDelegate:
83 void OnEmbed(ui::Window* root) override; 83 void OnEmbed(ui::Window* root) override;
84 void OnDidDestroyClient(ui::WindowTreeClient* client) override; 84 void OnEmbedRootDestroyed(ui::Window* root) override;
85 void OnLostConnection(ui::WindowTreeClient* client) override;
85 void OnPointerEventObserved(const ui::PointerEvent& event, 86 void OnPointerEventObserved(const ui::PointerEvent& event,
86 ui::Window* target) override; 87 ui::Window* target) override;
87 88
88 // views::WidgetDelegate: 89 // views::WidgetDelegate:
89 views::View* GetContentsView() override; 90 views::View* GetContentsView() override;
90 views::Widget* GetWidget() override; 91 views::Widget* GetWidget() override;
91 const views::Widget* GetWidget() const override; 92 const views::Widget* GetWidget() const override;
92 93
93 std::unique_ptr<shell::Connector> connector_; 94 std::unique_ptr<shell::Connector> connector_;
94 mojo::StrongBinding<mojom::View> binding_; 95 mojo::StrongBinding<mojom::View> binding_;
95 mojom::ViewClientPtr client_; 96 mojom::ViewClientPtr client_;
96 std::unique_ptr<shell::ServiceContextRef> ref_; 97 std::unique_ptr<shell::ServiceContextRef> ref_;
97 98
99 std::unique_ptr<ui::WindowTreeClient> window_tree_client_;
100
98 views::WebView* web_view_; 101 views::WebView* web_view_;
99 102
100 std::unique_ptr<content::WebContents> web_contents_; 103 std::unique_ptr<content::WebContents> web_contents_;
101 104
102 content::NotificationRegistrar registrar_; 105 content::NotificationRegistrar registrar_;
103 106
104 std::unique_ptr<views::Widget> widget_; 107 std::unique_ptr<views::Widget> widget_;
105 108
106 gfx::Size resizer_size_; 109 gfx::Size resizer_size_;
107 110
108 DISALLOW_COPY_AND_ASSIGN(ViewImpl); 111 DISALLOW_COPY_AND_ASSIGN(ViewImpl);
109 }; 112 };
110 113
111 } // navigation 114 } // navigation
112 115
113 #endif // SERVICES_NAVIGATION_VIEW_IMPL_H_ 116 #endif // SERVICES_NAVIGATION_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/mus/compositor_mus_connection.cc ('k') | services/navigation/view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698