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

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

Issue 2489513003: Fixes and test updates for aura-mus (Closed)
Patch Set: feedback Created 4 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/aura/mus/window_port_mus.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
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 void SetOpacity(float opacity) override; 83 void SetOpacity(float opacity) override;
84 void SetWindowIcons(const gfx::ImageSkia& window_icon, 84 void SetWindowIcons(const gfx::ImageSkia& window_icon,
85 const gfx::ImageSkia& app_icon) override; 85 const gfx::ImageSkia& app_icon) override;
86 void InitModalType(ui::ModalType modal_type) override; 86 void InitModalType(ui::ModalType modal_type) override;
87 void FlashFrame(bool flash_frame) override; 87 void FlashFrame(bool flash_frame) override;
88 void OnRootViewLayout() override; 88 void OnRootViewLayout() override;
89 bool IsAnimatingClosed() const override; 89 bool IsAnimatingClosed() const override;
90 bool IsTranslucentWindowOpacitySupported() const override; 90 bool IsTranslucentWindowOpacitySupported() const override;
91 void SizeConstraintsChanged() override; 91 void SizeConstraintsChanged() override;
92 92
93 // WindowTreeHostMus:
94 void ShowImpl() override;
95 void HideImpl() override;
96 void SetBounds(const gfx::Rect& bounds_in_pixels) override;
97
93 // aura::EnvObserver: 98 // aura::EnvObserver:
94 void OnWindowInitialized(aura::Window* window) override; 99 void OnWindowInitialized(aura::Window* window) override;
95 void OnActiveFocusClientChanged(aura::client::FocusClient* focus_client, 100 void OnActiveFocusClientChanged(aura::client::FocusClient* focus_client,
96 aura::Window* window) override; 101 aura::Window* window) override;
97 102
98 internal::NativeWidgetDelegate* native_widget_delegate_; 103 internal::NativeWidgetDelegate* native_widget_delegate_;
99 104
100 DesktopNativeWidgetAura* desktop_native_widget_aura_; 105 DesktopNativeWidgetAura* desktop_native_widget_aura_;
101 106
102 // State to restore window to when exiting fullscreen. Only valid if 107 // State to restore window to when exiting fullscreen. Only valid if
103 // fullscreen. 108 // fullscreen.
104 ui::WindowShowState fullscreen_restore_state_; 109 ui::WindowShowState fullscreen_restore_state_;
105 110
106 // We can optionally have a parent which can order us to close, or own 111 // We can optionally have a parent which can order us to close, or own
107 // children who we're responsible for closing when we CloseNow(). 112 // children who we're responsible for closing when we CloseNow().
108 DesktopWindowTreeHostMus* parent_ = nullptr; 113 DesktopWindowTreeHostMus* parent_ = nullptr;
109 std::set<DesktopWindowTreeHostMus*> children_; 114 std::set<DesktopWindowTreeHostMus*> children_;
110 115
111 bool is_active_ = false; 116 bool is_active_ = false;
112 117
113 // Used so that Close() isn't immediate. 118 // Used so that Close() isn't immediate.
114 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_; 119 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_;
115 120
116 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus); 121 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus);
117 }; 122 };
118 123
119 } // namespace views 124 } // namespace views
120 125
121 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ 126 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_port_mus.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