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

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

Issue 2576533003: Converts some services to use aura-mus (Closed)
Patch Set: remove log 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
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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 wm::CompoundEventFilter* root_window_event_filter() { 85 wm::CompoundEventFilter* root_window_event_filter() {
86 return root_window_event_filter_.get(); 86 return root_window_event_filter_.get();
87 } 87 }
88 aura::WindowTreeHost* host() { 88 aura::WindowTreeHost* host() {
89 return host_.get(); 89 return host_.get();
90 } 90 }
91 91
92 aura::Window* content_window() { return content_window_; } 92 aura::Window* content_window() { return content_window_; }
93 93
94 Widget::InitParams::Type widget_type() const { return widget_type_; }
95
94 // Ensures that the correct window is activated/deactivated based on whether 96 // Ensures that the correct window is activated/deactivated based on whether
95 // we are being activated/deactivated. 97 // we are being activated/deactivated.
96 void HandleActivationChanged(bool active); 98 void HandleActivationChanged(bool active);
97 99
98 protected: 100 protected:
99 // Overridden from internal::NativeWidgetPrivate: 101 // Overridden from internal::NativeWidgetPrivate:
100 void InitNativeWidget(const Widget::InitParams& params) override; 102 void InitNativeWidget(const Widget::InitParams& params) override;
101 void OnWidgetInitDone() override; 103 void OnWidgetInitDone() override;
102 NonClientFrameView* CreateNonClientFrameView() override; 104 NonClientFrameView* CreateNonClientFrameView() override;
103 bool ShouldUseNativeFrame() const override; 105 bool ShouldUseNativeFrame() const override;
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 // The following factory is used for calls to close the NativeWidgetAura 314 // The following factory is used for calls to close the NativeWidgetAura
313 // instance. 315 // instance.
314 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; 316 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
315 317
316 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 318 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
317 }; 319 };
318 320
319 } // namespace views 321 } // namespace views
320 322
321 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 323 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/mus/pointer_watcher_event_router2.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698