OLD | NEW |
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 "chrome/browser/chrome_browser_main_extra_parts_aura.h" | 5 #include "chrome/browser/chrome_browser_main_extra_parts_aura.h" |
6 | 6 |
7 #include "ui/aura/env.h" | 7 #include "ui/aura/env.h" |
8 | 8 |
| 9 #if !defined(USE_ASH) |
| 10 #include "ui/aura/desktop/desktop_stacking_client.h" |
| 11 #include "ui/views/widget/native_widget_aura.h" |
| 12 #endif // !USE_ASH |
| 13 |
9 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() | 14 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() |
10 : ChromeBrowserMainExtraParts() { | 15 : ChromeBrowserMainExtraParts() { |
11 } | 16 } |
12 | 17 |
| 18 void ChromeBrowserMainExtraPartsAura::PreProfileInit() { |
| 19 #if !defined(USE_ASH) |
| 20 stacking_client_.reset(new aura::DesktopStackingClient); |
| 21 #endif // !USE_ASH |
| 22 } |
| 23 |
13 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { | 24 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { |
| 25 #if !defined(USE_ASH) |
| 26 stacking_client_.reset(); |
| 27 #endif |
| 28 |
14 // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown | 29 // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown |
15 // after the metrics service is deleted. | 30 // after the metrics service is deleted. |
16 } | 31 } |
OLD | NEW |