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

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

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + disable prerender tests on win-aura 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_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 scoped_ptr<NativeWidgetAuraWindowObserver> active_window_observer_; 174 scoped_ptr<NativeWidgetAuraWindowObserver> active_window_observer_;
175 175
176 // Can we be made active? 176 // Can we be made active?
177 bool can_activate_; 177 bool can_activate_;
178 178
179 // Ownership passed to RootWindow on Init. 179 // Ownership passed to RootWindow on Init.
180 DesktopRootWindowHost* desktop_root_window_host_; 180 DesktopRootWindowHost* desktop_root_window_host_;
181 aura::Window* window_; 181 aura::Window* window_;
182 internal::NativeWidgetDelegate* native_widget_delegate_; 182 internal::NativeWidgetDelegate* native_widget_delegate_;
183 183
184 scoped_ptr<aura::client::StackingClient> stacking_client_;
185
186 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 184 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
187 }; 185 };
188 186
189 } // namespace views 187 } // namespace views
190 188
191 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_ 189 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/examples/content_client/examples_browser_main_parts.cc ('k') | ui/views/widget/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698