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

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

Issue 1438903002: p1 mus+ash chrome renders ui and content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased, fixed release build 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/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 "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"
11 #include "ui/views/mus/mus_export.h" 11 #include "ui/views/mus/mus_export.h"
12 12
13 class SkBitmap; 13 class SkBitmap;
14 14
15 namespace bitmap_uploader {
16 class BitmapUploader;
17 }
18
15 namespace mojo { 19 namespace mojo {
16 class Shell; 20 class Shell;
17 } 21 }
18 22
19 namespace mus { 23 namespace mus {
20 class Window; 24 class Window;
21 } 25 }
22 26
23 namespace ui { 27 namespace ui {
24 class Compositor; 28 class Compositor;
29 class ViewProp;
25 } 30 }
26 31
27 namespace views { 32 namespace views {
28 33
29 class InputMethodMUS; 34 class InputMethodMUS;
30 class NativeWidgetMus; 35 class NativeWidgetMus;
31 class PlatformWindowMus; 36 class PlatformWindowMus;
32 37
33 class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform { 38 class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
34 public: 39 public:
35 WindowTreeHostMus(mojo::Shell* shell, 40 WindowTreeHostMus(mojo::Shell* shell,
36 NativeWidgetMus* native_widget_, 41 NativeWidgetMus* native_widget_,
37 mus::Window* window, 42 mus::Window* window,
38 mus::mojom::SurfaceType surface_type); 43 mus::mojom::SurfaceType surface_type);
39 ~WindowTreeHostMus() override; 44 ~WindowTreeHostMus() override;
40 45
41 PlatformWindowMus* platform_window(); 46 PlatformWindowMus* platform_window();
47 bitmap_uploader::BitmapUploader* bitmap_uploader() {
48 return bitmap_uploader_.get();
49 };
42 ui::PlatformWindowState show_state() const { return show_state_; } 50 ui::PlatformWindowState show_state() const { return show_state_; }
43 51
44 private: 52 private:
45 // aura::WindowTreeHostPlatform: 53 // aura::WindowTreeHostPlatform:
46 void DispatchEvent(ui::Event* event) override; 54 void DispatchEvent(ui::Event* event) override;
47 void OnClosed() override; 55 void OnClosed() override;
48 void OnWindowStateChanged(ui::PlatformWindowState new_state) override; 56 void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
49 void OnActivationChanged(bool active) override; 57 void OnActivationChanged(bool active) override;
50 58
51 NativeWidgetMus* native_widget_; 59 NativeWidgetMus* native_widget_;
52 scoped_ptr<InputMethodMUS> input_method_; 60 scoped_ptr<InputMethodMUS> input_method_;
53 ui::PlatformWindowState show_state_; 61 ui::PlatformWindowState show_state_;
62 scoped_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_;
63 scoped_ptr<ui::ViewProp> prop_;
54 64
55 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); 65 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
56 }; 66 };
57 67
58 } // namespace views 68 } // namespace views
59 69
60 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ 70 #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