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

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

Issue 2669203002: Revert: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient() (Closed)
Patch Set: Created 3 years, 10 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 | « mash/simple_wm/simple_wm.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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 const content::NotificationSource& source, 78 const content::NotificationSource& source,
79 const content::NotificationDetails& details) override; 79 const content::NotificationDetails& details) override;
80 80
81 // aura::WindowTreeClientDelegate: 81 // aura::WindowTreeClientDelegate:
82 void OnEmbed( 82 void OnEmbed(
83 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; 83 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
84 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; 84 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
85 void OnLostConnection(aura::WindowTreeClient* client) override; 85 void OnLostConnection(aura::WindowTreeClient* client) override;
86 void OnPointerEventObserved(const ui::PointerEvent& event, 86 void OnPointerEventObserved(const ui::PointerEvent& event,
87 aura::Window* target) override; 87 aura::Window* target) override;
88 aura::client::CaptureClient* GetCaptureClient() override;
88 aura::PropertyConverter* GetPropertyConverter() override; 89 aura::PropertyConverter* GetPropertyConverter() override;
89 90
90 // views::WidgetDelegate: 91 // views::WidgetDelegate:
91 views::View* GetContentsView() override; 92 views::View* GetContentsView() override;
92 views::Widget* GetWidget() override; 93 views::Widget* GetWidget() override;
93 const views::Widget* GetWidget() const override; 94 const views::Widget* GetWidget() const override;
94 95
95 std::unique_ptr<service_manager::Connector> connector_; 96 std::unique_ptr<service_manager::Connector> connector_;
96 mojom::ViewClientPtr client_; 97 mojom::ViewClientPtr client_;
97 std::unique_ptr<service_manager::ServiceContextRef> ref_; 98 std::unique_ptr<service_manager::ServiceContextRef> ref_;
98 99
99 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; 100 std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
100 101
101 views::WebView* web_view_; 102 views::WebView* web_view_;
102 103
103 std::unique_ptr<content::WebContents> web_contents_; 104 std::unique_ptr<content::WebContents> web_contents_;
104 105
105 content::NotificationRegistrar registrar_; 106 content::NotificationRegistrar registrar_;
106 107
107 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_; 108 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
108 std::unique_ptr<views::Widget> widget_; 109 std::unique_ptr<views::Widget> widget_;
109 110
110 DISALLOW_COPY_AND_ASSIGN(ViewImpl); 111 DISALLOW_COPY_AND_ASSIGN(ViewImpl);
111 }; 112 };
112 113
113 } // navigation 114 } // navigation
114 115
115 #endif // SERVICES_NAVIGATION_VIEW_IMPL_H_ 116 #endif // SERVICES_NAVIGATION_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « mash/simple_wm/simple_wm.cc ('k') | services/navigation/view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698