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

Side by Side Diff: blimp/engine/session/blimp_engine_session.h

Issue 2438853002: Renames aura::client::WindowTreeClient to WindowParentingClient (Closed)
Patch Set: cleanup Created 4 years, 2 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 BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ 5 #ifndef BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_
6 #define BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ 6 #define BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 12 matching lines...) Expand all
23 #include "content/public/browser/web_contents_delegate.h" 23 #include "content/public/browser/web_contents_delegate.h"
24 #include "net/base/completion_callback.h" 24 #include "net/base/completion_callback.h"
25 #include "ui/base/ime/input_method_observer.h" 25 #include "ui/base/ime/input_method_observer.h"
26 #include "ui/gfx/geometry/size.h" 26 #include "ui/gfx/geometry/size.h"
27 27
28 namespace aura { 28 namespace aura {
29 class WindowTreeHost; 29 class WindowTreeHost;
30 30
31 namespace client { 31 namespace client {
32 class DefaultCaptureClient; 32 class DefaultCaptureClient;
33 class WindowTreeClient; 33 class WindowParentingClient;
34 } // namespace client 34 } // namespace client
35 } // namespace aura 35 } // namespace aura
36 36
37 namespace content { 37 namespace content {
38 class BrowserContext; 38 class BrowserContext;
39 class WebContents; 39 class WebContents;
40 } 40 }
41 41
42 namespace gfx { 42 namespace gfx {
43 class Size; 43 class Size;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 std::unique_ptr<BlimpWindowTreeHost> window_tree_host_; 170 std::unique_ptr<BlimpWindowTreeHost> window_tree_host_;
171 171
172 // Used to apply standard focus conventions to the windows in the 172 // Used to apply standard focus conventions to the windows in the
173 // WindowTreeHost hierarchy. 173 // WindowTreeHost hierarchy.
174 std::unique_ptr<wm::FocusController> focus_client_; 174 std::unique_ptr<wm::FocusController> focus_client_;
175 175
176 // Used to manage input capture. 176 // Used to manage input capture.
177 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; 177 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
178 178
179 // Used to attach null-parented windows (e.g. popups) to the root window. 179 // Used to attach null-parented windows (e.g. popups) to the root window.
180 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; 180 std::unique_ptr<aura::client::WindowParentingClient> window_parenting_client_;
181 181
182 // Manages all global settings for the engine session. 182 // Manages all global settings for the engine session.
183 SettingsManager* settings_manager_; 183 SettingsManager* settings_manager_;
184 184
185 // Handles all incoming messages for type SETTINGS. 185 // Handles all incoming messages for type SETTINGS.
186 EngineSettingsFeature settings_feature_; 186 EngineSettingsFeature settings_feature_;
187 187
188 // Handles all incoming and outgoing messages related to RenderWidget, 188 // Handles all incoming and outgoing messages related to RenderWidget,
189 // including INPUT, COMPOSITOR and RENDER_WIDGET messages. 189 // including INPUT, COMPOSITOR and RENDER_WIDGET messages.
190 EngineRenderWidgetFeature render_widget_feature_; 190 EngineRenderWidgetFeature render_widget_feature_;
(...skipping 29 matching lines...) Expand all
220 // TODO(haibinlu): Support more than one tab (crbug/547231) 220 // TODO(haibinlu): Support more than one tab (crbug/547231)
221 std::unique_ptr<Tab> tab_; 221 std::unique_ptr<Tab> tab_;
222 222
223 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession); 223 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession);
224 }; 224 };
225 225
226 } // namespace engine 226 } // namespace engine
227 } // namespace blimp 227 } // namespace blimp
228 228
229 #endif // BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ 229 #endif // BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_
OLDNEW
« no previous file with comments | « blimp/engine/app/ui/blimp_window_tree_client.cc ('k') | blimp/engine/session/blimp_engine_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698