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

Side by Side Diff: ui/views/mus/window_manager_connection.h

Issue 2194003002: services/ui: Have an explicit lifetime/ownership of ui::GpuService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot merge Created 4 years, 4 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 | « services/ui/demo/mus_demo.cc ('k') | ui/views/mus/window_manager_connection.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 UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ 5 #ifndef UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ 6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "services/shell/public/cpp/identity.h" 17 #include "services/shell/public/cpp/identity.h"
18 #include "services/ui/public/cpp/window_tree_client_delegate.h" 18 #include "services/ui/public/cpp/window_tree_client_delegate.h"
19 #include "ui/views/mus/mus_export.h" 19 #include "ui/views/mus/mus_export.h"
20 #include "ui/views/mus/screen_mus_delegate.h" 20 #include "ui/views/mus/screen_mus_delegate.h"
21 #include "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
22 22
23 namespace shell { 23 namespace shell {
24 class Connector; 24 class Connector;
25 } 25 }
26 26
27 namespace ui {
28 class GpuService;
29 }
30
27 namespace views { 31 namespace views {
28 class ClipboardMus; 32 class ClipboardMus;
29 class NativeWidget; 33 class NativeWidget;
30 class PointerWatcher; 34 class PointerWatcher;
31 class TouchEventWatcher; 35 class TouchEventWatcher;
32 class ScreenMus; 36 class ScreenMus;
33 namespace internal { 37 namespace internal {
34 class NativeWidgetDelegate; 38 class NativeWidgetDelegate;
35 } 39 }
36 40
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 void OnEventObserved(const ui::Event& event, ui::Window* target) override; 93 void OnEventObserved(const ui::Event& event, ui::Window* target) override;
90 94
91 // ScreenMusDelegate: 95 // ScreenMusDelegate:
92 void OnWindowManagerFrameValuesChanged() override; 96 void OnWindowManagerFrameValuesChanged() override;
93 gfx::Point GetCursorScreenPoint() override; 97 gfx::Point GetCursorScreenPoint() override;
94 98
95 shell::Connector* connector_; 99 shell::Connector* connector_;
96 shell::Identity identity_; 100 shell::Identity identity_;
97 std::unique_ptr<ScreenMus> screen_; 101 std::unique_ptr<ScreenMus> screen_;
98 std::unique_ptr<ui::WindowTreeClient> client_; 102 std::unique_ptr<ui::WindowTreeClient> client_;
103 std::unique_ptr<ui::GpuService> gpu_service_;
99 // Must be empty on destruction. 104 // Must be empty on destruction.
100 base::ObserverList<PointerWatcher, true> pointer_watchers_; 105 base::ObserverList<PointerWatcher, true> pointer_watchers_;
101 base::ObserverList<TouchEventWatcher, true> touch_event_watchers_; 106 base::ObserverList<TouchEventWatcher, true> touch_event_watchers_;
102 107
103 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); 108 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
104 }; 109 };
105 110
106 } // namespace views 111 } // namespace views
107 112
108 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ 113 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
OLDNEW
« no previous file with comments | « services/ui/demo/mus_demo.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698