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

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

Issue 1644773004: Renames some WindowManager classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 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/wm/window_manager_impl.h ('k') | no next file » | 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 "base/macros.h" 10 #include "base/macros.h"
(...skipping 22 matching lines...) Expand all
33 public ScreenMusDelegate { 33 public ScreenMusDelegate {
34 public: 34 public:
35 static void Create(mojo::ApplicationImpl* app); 35 static void Create(mojo::ApplicationImpl* app);
36 static WindowManagerConnection* Get(); 36 static WindowManagerConnection* Get();
37 37
38 mojo::ApplicationImpl* app() { return app_; } 38 mojo::ApplicationImpl* app() { return app_; }
39 39
40 mus::Window* NewWindow(const std::map<std::string, 40 mus::Window* NewWindow(const std::map<std::string,
41 std::vector<uint8_t>>& properties); 41 std::vector<uint8_t>>& properties);
42 42
43 mus::mojom::WindowManager* window_manager() { 43 mus::mojom::WindowManagerDeprecated* window_manager() {
44 return window_manager_.get(); 44 return window_manager_.get();
45 } 45 }
46 46
47 private: 47 private:
48 explicit WindowManagerConnection(mojo::ApplicationImpl* app); 48 explicit WindowManagerConnection(mojo::ApplicationImpl* app);
49 ~WindowManagerConnection() override; 49 ~WindowManagerConnection() override;
50 50
51 // mus::WindowTreeDelegate: 51 // mus::WindowTreeDelegate:
52 void OnEmbed(mus::Window* root) override; 52 void OnEmbed(mus::Window* root) override;
53 void OnConnectionLost(mus::WindowTreeConnection* connection) override; 53 void OnConnectionLost(mus::WindowTreeConnection* connection) override;
54 54
55 // ScreenMusDelegate: 55 // ScreenMusDelegate:
56 void OnWindowManagerFrameValuesChanged() override; 56 void OnWindowManagerFrameValuesChanged() override;
57 57
58 NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params, 58 NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params,
59 internal::NativeWidgetDelegate* delegate); 59 internal::NativeWidgetDelegate* delegate);
60 60
61 mojo::ApplicationImpl* app_; 61 mojo::ApplicationImpl* app_;
62 mus::mojom::WindowManagerPtr window_manager_; 62 mus::mojom::WindowManagerDeprecatedPtr window_manager_;
63 scoped_ptr<ScreenMus> screen_; 63 scoped_ptr<ScreenMus> screen_;
64 scoped_ptr<mus::WindowTreeConnection> window_tree_connection_; 64 scoped_ptr<mus::WindowTreeConnection> window_tree_connection_;
65 65
66 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); 66 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
67 }; 67 };
68 68
69 } // namespace views 69 } // namespace views
70 70
71 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ 71 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
OLDNEW
« no previous file with comments | « mash/wm/window_manager_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698