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

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

Issue 11377140: re-re-land of https://codereview.chromium.org/11364053/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more renames\! Created 8 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 | Annotate | Revision Log
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 "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "ui/aura/client/activation_delegate.h" 9 #include "ui/aura/client/activation_delegate.h"
10 #include "ui/aura/window_delegate.h" 10 #include "ui/aura/window_delegate.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 scoped_ptr<NativeWidgetAuraWindowObserver> active_window_observer_; 173 scoped_ptr<NativeWidgetAuraWindowObserver> active_window_observer_;
174 174
175 // Can we be made active? 175 // Can we be made active?
176 bool can_activate_; 176 bool can_activate_;
177 177
178 // Ownership passed to RootWindow on Init. 178 // Ownership passed to RootWindow on Init.
179 DesktopRootWindowHost* desktop_root_window_host_; 179 DesktopRootWindowHost* desktop_root_window_host_;
180 aura::Window* window_; 180 aura::Window* window_;
181 internal::NativeWidgetDelegate* native_widget_delegate_; 181 internal::NativeWidgetDelegate* native_widget_delegate_;
182 182
183 scoped_ptr<aura::client::StackingClient> stacking_client_;
184
185 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 183 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
186 }; 184 };
187 185
188 } // namespace views 186 } // namespace views
189 187
190 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 188 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698