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

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

Issue 1416373010: Implement a MusBrowserFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome
Patch Set: . Created 5 years, 1 month 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 | « ui/views/mus/window_manager_connection.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_TREE_HOST_MUS_H_ 5 #ifndef UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
6 #define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ 6 #define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "components/mus/public/interfaces/window_tree.mojom.h" 9 #include "components/mus/public/interfaces/window_tree.mojom.h"
10 #include "ui/aura/window_tree_host_platform.h" 10 #include "ui/aura/window_tree_host_platform.h"
(...skipping 17 matching lines...) Expand all
28 class InputMethodMUS; 28 class InputMethodMUS;
29 class SurfaceContextFactory; 29 class SurfaceContextFactory;
30 30
31 class WindowTreeHostMus : public aura::WindowTreeHostPlatform { 31 class WindowTreeHostMus : public aura::WindowTreeHostPlatform {
32 public: 32 public:
33 WindowTreeHostMus(mojo::Shell* shell, 33 WindowTreeHostMus(mojo::Shell* shell,
34 mus::Window* window, 34 mus::Window* window,
35 mus::mojom::SurfaceType surface_type); 35 mus::mojom::SurfaceType surface_type);
36 ~WindowTreeHostMus() override; 36 ~WindowTreeHostMus() override;
37 37
38 mus::Window* mus_window() { return mus_window_; }
39
38 using WindowTreeHostPlatform::platform_window; 40 using WindowTreeHostPlatform::platform_window;
39 ui::PlatformWindowState show_state() const { return show_state_; } 41 ui::PlatformWindowState show_state() const { return show_state_; }
40 42
41 private: 43 private:
42 // aura::WindowTreeHostPlatform: 44 // aura::WindowTreeHostPlatform:
43 void OnClosed() override; 45 void OnClosed() override;
44 void OnWindowStateChanged(ui::PlatformWindowState new_state) override; 46 void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
45 void OnActivationChanged(bool active) override; 47 void OnActivationChanged(bool active) override;
46 48
47 mus::Window* mus_window_; 49 mus::Window* mus_window_;
48 scoped_ptr<InputMethodMUS> input_method_; 50 scoped_ptr<InputMethodMUS> input_method_;
49 scoped_ptr<SurfaceContextFactory> context_factory_; 51 scoped_ptr<SurfaceContextFactory> context_factory_;
50 ui::PlatformWindowState show_state_; 52 ui::PlatformWindowState show_state_;
51 53
52 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); 54 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
53 }; 55 };
54 56
55 } // namespace views 57 } // namespace views
56 58
57 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ 59 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/mus/window_manager_connection.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698