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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Issue 2490273002: Couple of fixes for DesktopWindowTreeHostMus. (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/views/mus/desktop_window_tree_host_mus.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // as by the time we get here |dispatcher_| is NULL. 83 // as by the time we get here |dispatcher_| is NULL.
84 virtual void OnDesktopWindowTreeHostDestroyed(aura::WindowTreeHost* host); 84 virtual void OnDesktopWindowTreeHostDestroyed(aura::WindowTreeHost* host);
85 85
86 wm::CompoundEventFilter* root_window_event_filter() { 86 wm::CompoundEventFilter* root_window_event_filter() {
87 return root_window_event_filter_.get(); 87 return root_window_event_filter_.get();
88 } 88 }
89 aura::WindowTreeHost* host() { 89 aura::WindowTreeHost* host() {
90 return host_.get(); 90 return host_.get();
91 } 91 }
92 92
93 aura::Window* content_window() { return content_window_; }
94
93 // Ensures that the correct window is activated/deactivated based on whether 95 // Ensures that the correct window is activated/deactivated based on whether
94 // we are being activated/deactivated. 96 // we are being activated/deactivated.
95 void HandleActivationChanged(bool active); 97 void HandleActivationChanged(bool active);
96 98
97 protected: 99 protected:
98 // Overridden from internal::NativeWidgetPrivate: 100 // Overridden from internal::NativeWidgetPrivate:
99 void InitNativeWidget(const Widget::InitParams& params) override; 101 void InitNativeWidget(const Widget::InitParams& params) override;
100 void OnWidgetInitDone() override; 102 void OnWidgetInitDone() override;
101 NonClientFrameView* CreateNonClientFrameView() override; 103 NonClientFrameView* CreateNonClientFrameView() override;
102 bool ShouldUseNativeFrame() const override; 104 bool ShouldUseNativeFrame() const override;
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 // The following factory is used for calls to close the NativeWidgetAura 310 // The following factory is used for calls to close the NativeWidgetAura
309 // instance. 311 // instance.
310 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; 312 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
311 313
312 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 314 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
313 }; 315 };
314 316
315 } // namespace views 317 } // namespace views
316 318
317 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 319 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/mus/desktop_window_tree_host_mus.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698