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

Side by Side Diff: ash/host/ash_window_tree_host_platform.h

Issue 1683853003: Revert of ash/mash: Add a mus-client that sets up ash to provide the system ui for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/host/ash_window_tree_host.cc ('k') | ash/mus/BUILD.gn » ('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 ASH_HOST_ASH_WINDOW_TREE_HOST_PLATFORM_H_ 5 #ifndef ASH_HOST_ASH_WINDOW_TREE_HOST_PLATFORM_H_
6 #define ASH_HOST_ASH_WINDOW_TREE_HOST_PLATFORM_H_ 6 #define ASH_HOST_ASH_WINDOW_TREE_HOST_PLATFORM_H_
7 7
8 #include "ash/ash_export.h"
9 #include "ash/host/ash_window_tree_host.h" 8 #include "ash/host/ash_window_tree_host.h"
10 #include "ash/host/transformer_helper.h" 9 #include "ash/host/transformer_helper.h"
11 #include "ui/aura/window_tree_host_platform.h" 10 #include "ui/aura/window_tree_host_platform.h"
12 11
13 namespace ash { 12 namespace ash {
14 13
15 class ASH_EXPORT AshWindowTreeHostPlatform 14 class AshWindowTreeHostPlatform : public AshWindowTreeHost,
16 : public AshWindowTreeHost, 15 public aura::WindowTreeHostPlatform {
17 public aura::WindowTreeHostPlatform {
18 public: 16 public:
19 explicit AshWindowTreeHostPlatform(const gfx::Rect& initial_bounds); 17 explicit AshWindowTreeHostPlatform(const gfx::Rect& initial_bounds);
20 ~AshWindowTreeHostPlatform() override; 18 ~AshWindowTreeHostPlatform() override;
21 19
22 protected: 20 protected:
23 AshWindowTreeHostPlatform(); 21 AshWindowTreeHostPlatform();
24 22
25 // AshWindowTreeHost: 23 // AshWindowTreeHost:
26 void ToggleFullScreen() override; 24 void ToggleFullScreen() override;
27 bool ConfineCursorToRootWindow() override; 25 bool ConfineCursorToRootWindow() override;
(...skipping 20 matching lines...) Expand all
48 void SetTapToClickPaused(bool state); 46 void SetTapToClickPaused(bool state);
49 47
50 TransformerHelper transformer_helper_; 48 TransformerHelper transformer_helper_;
51 49
52 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostPlatform); 50 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostPlatform);
53 }; 51 };
54 52
55 } // namespace ash 53 } // namespace ash
56 54
57 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_PLATFORM_H_ 55 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_PLATFORM_H_
OLDNEW
« no previous file with comments | « ash/host/ash_window_tree_host.cc ('k') | ash/mus/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698