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

Unified Diff: ui/aura/desktop/desktop_stacking_client.h

Issue 10407022: Make Chrome limp briefly before freaking out with aura no ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | ui/aura/desktop/desktop_stacking_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop/desktop_stacking_client.h
===================================================================
--- ui/aura/desktop/desktop_stacking_client.h (revision 137506)
+++ ui/aura/desktop/desktop_stacking_client.h (working copy)
@@ -9,9 +9,11 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
#include "ui/aura/aura_export.h"
namespace aura {
+class RootWindow;
class Window;
// A stacking client for the desktop; always sets the default parent to the
@@ -24,6 +26,10 @@
// Overridden from client::StackingClient:
virtual Window* GetDefaultParent(Window* window) OVERRIDE;
+ private:
+ // Windows with NULL parents are parented to this.
+ scoped_ptr<aura::RootWindow> null_parent_;
+
DISALLOW_COPY_AND_ASSIGN(DesktopStackingClient);
};
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | ui/aura/desktop/desktop_stacking_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698