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

Side by Side Diff: ui/aura/desktop/desktop_stacking_client.cc

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 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 #include "ui/aura/desktop/desktop_stacking_client.h" 5 #include "ui/aura/desktop/desktop_stacking_client.h"
6 6
7 #include "ui/aura/root_window.h" 7 #include "ui/aura/root_window.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 9
10 namespace aura { 10 namespace aura {
11 11
12 DesktopStackingClient::DesktopStackingClient() { 12 DesktopStackingClient::DesktopStackingClient() {
13 aura::client::SetStackingClient(this); 13 aura::client::SetStackingClient(this);
14 } 14 }
15 15
16 DesktopStackingClient::~DesktopStackingClient() { 16 DesktopStackingClient::~DesktopStackingClient() {
17 aura::client::SetStackingClient(NULL); 17 aura::client::SetStackingClient(NULL);
18 } 18 }
19 19
20 Window* DesktopStackingClient::GetDefaultParent(Window* window) { 20 Window* DesktopStackingClient::GetDefaultParent(Window* window) {
21 return window->GetRootWindow(); 21 if (!null_parent_.get()) {
22 null_parent_.reset(new aura::RootWindow(gfx::Rect(100, 100)));
23 null_parent_->Init();
24 }
25 return null_parent_.get();
22 } 26 }
23 27
24 } // namespace aura 28 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/desktop/desktop_stacking_client.h ('k') | ui/views/widget/desktop_native_widget_helper_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698