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

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

Issue 2013713002: Revert of Finish eliminating PlatformWindowMus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « ui/views/mus/platform_window_mus.cc ('k') | ui/views/mus/window_tree_host_mus.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_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 "ui/aura/window_tree_host_platform.h" 9 #include "ui/aura/window_tree_host_platform.h"
10 #include "ui/views/mus/mus_export.h" 10 #include "ui/views/mus/mus_export.h"
11 11
12 class SkBitmap; 12 class SkBitmap;
13 13
14 namespace bitmap_uploader {
15 class BitmapUploader;
16 }
17
18 namespace mus { 14 namespace mus {
19 class Window; 15 class Window;
20 } 16 }
21 17
22 namespace shell { 18 namespace shell {
23 class Connector; 19 class Connector;
24 } 20 }
25 21
26 namespace ui {
27 class ViewProp;
28 }
29
30 namespace views { 22 namespace views {
31 23
32 class InputMethodMUS; 24 class InputMethodMUS;
33 class NativeWidgetMus; 25 class NativeWidgetMus;
34 class PlatformWindowMus; 26 class PlatformWindowMus;
35 27
36 class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform { 28 class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
37 public: 29 public:
38 WindowTreeHostMus(shell::Connector* connector, 30 WindowTreeHostMus(shell::Connector* connector,
39 NativeWidgetMus* native_widget, 31 NativeWidgetMus* native_widget,
40 mus::Window* window); 32 mus::Window* window);
41 ~WindowTreeHostMus() override; 33 ~WindowTreeHostMus() override;
42 34
35 PlatformWindowMus* platform_window();
36
43 private: 37 private:
44 // aura::WindowTreeHostPlatform: 38 // aura::WindowTreeHostPlatform:
45 void DispatchEvent(ui::Event* event) override; 39 void DispatchEvent(ui::Event* event) override;
46 void OnClosed() override; 40 void OnClosed() override;
47 void OnActivationChanged(bool active) override; 41 void OnActivationChanged(bool active) override;
48 void OnCloseRequest() override; 42 void OnCloseRequest() override;
49 43
50 NativeWidgetMus* native_widget_; 44 NativeWidgetMus* native_widget_;
51 std::unique_ptr<InputMethodMUS> input_method_; 45 std::unique_ptr<InputMethodMUS> input_method_;
52 46
53 // Bitmap management.
54 std::unique_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_;
55 std::unique_ptr<ui::ViewProp> prop_;
56
57 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); 47 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
58 }; 48 };
59 49
60 } // namespace views 50 } // namespace views
61 51
62 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ 52 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/mus/platform_window_mus.cc ('k') | ui/views/mus/window_tree_host_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698