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

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

Issue 2514243002: Propagates window type properties during aura-mus window creation (Closed)
Patch Set: merge Created 4 years 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/aura/test/aura_test_base.cc ('k') | ui/views/mus/desktop_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 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 UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "ui/aura/env_observer.h" 12 #include "ui/aura/env_observer.h"
13 #include "ui/aura/mus/window_tree_host_mus.h" 13 #include "ui/aura/mus/window_tree_host_mus.h"
14 #include "ui/views/mus/mus_export.h" 14 #include "ui/views/mus/mus_export.h"
15 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" 15 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
16 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
17 17
18 namespace views { 18 namespace views {
19 19
20 class VIEWS_MUS_EXPORT DesktopWindowTreeHostMus 20 class VIEWS_MUS_EXPORT DesktopWindowTreeHostMus
21 : public DesktopWindowTreeHost, 21 : public DesktopWindowTreeHost,
22 public aura::WindowTreeHostMus, 22 public aura::WindowTreeHostMus,
23 public aura::EnvObserver { 23 public aura::EnvObserver {
24 public: 24 public:
25 DesktopWindowTreeHostMus( 25 DesktopWindowTreeHostMus(
26 internal::NativeWidgetDelegate* native_widget_delegate, 26 internal::NativeWidgetDelegate* native_widget_delegate,
27 DesktopNativeWidgetAura* desktop_native_widget_aura, 27 DesktopNativeWidgetAura* desktop_native_widget_aura,
28 const Widget::InitParams& init_params); 28 const std::map<std::string, std::vector<uint8_t>>* mus_properties);
29 ~DesktopWindowTreeHostMus() override; 29 ~DesktopWindowTreeHostMus() override;
30 30
31 private: 31 private:
32 bool IsDocked() const; 32 bool IsDocked() const;
33 33
34 // DesktopWindowTreeHost: 34 // DesktopWindowTreeHost:
35 void Init(aura::Window* content_window, 35 void Init(aura::Window* content_window,
36 const Widget::InitParams& params) override; 36 const Widget::InitParams& params) override;
37 void OnNativeWidgetCreated(const Widget::InitParams& params) override; 37 void OnNativeWidgetCreated(const Widget::InitParams& params) override;
38 std::unique_ptr<corewm::Tooltip> CreateTooltip() override; 38 std::unique_ptr<corewm::Tooltip> CreateTooltip() override;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 // Used so that Close() isn't immediate. 119 // Used so that Close() isn't immediate.
120 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_; 120 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_;
121 121
122 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus); 122 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus);
123 }; 123 };
124 124
125 } // namespace views 125 } // namespace views
126 126
127 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ 127 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_
OLDNEW
« no previous file with comments | « ui/aura/test/aura_test_base.cc ('k') | ui/views/mus/desktop_window_tree_host_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698