| 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/ui/aura/chrome_browser_main_extra_parts_aura.h" | 5 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chrome_browser_main.h" | 7 #include "chrome/browser/chrome_browser_main.h" |
| 8 #include "chrome/browser/toolkit_extra_parts.h" | 8 #include "chrome/browser/toolkit_extra_parts.h" |
| 9 #include "ui/aura/env.h" | 9 #include "ui/aura/env.h" |
| 10 | 10 |
| 11 #if !defined(USE_ASH) | 11 #if !defined(USE_ASH) |
| 12 #include "ui/aura/desktop/desktop_screen.h" | 12 #include "ui/aura/desktop/desktop_screen.h" |
| 13 #include "ui/aura/desktop/desktop_stacking_client.h" | 13 #include "ui/aura/desktop/desktop_stacking_client.h" |
| 14 #include "ui/aura/env.h" | 14 #include "ui/aura/env.h" |
| 15 #include "ui/aura/single_display_manager.h" | 15 #include "ui/aura/single_display_manager.h" |
| 16 #include "ui/gfx/screen.h" | 16 #include "ui/gfx/screen.h" |
| 17 #include "ui/views/widget/native_widget_aura.h" | 17 #include "ui/views/widget/native_widget_aura.h" |
| 18 #if defined(OS_LINUX) | 18 #if defined(OS_LINUX) |
| 19 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
| 19 #include "ui/base/linux_ui.h" | 20 #include "ui/base/linux_ui.h" |
| 20 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" | |
| 21 #endif | 21 #endif |
| 22 #endif // !USE_ASH | 22 #endif // !USE_ASH |
| 23 | 23 |
| 24 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() { | 24 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() { |
| 25 } | 25 } |
| 26 | 26 |
| 27 ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() { | 27 ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() { |
| 28 } | 28 } |
| 29 | 29 |
| 30 void ChromeBrowserMainExtraPartsAura::PreProfileInit() { | 30 void ChromeBrowserMainExtraPartsAura::PreProfileInit() { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 42 | 42 |
| 43 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { | 43 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { |
| 44 #if !defined(USE_ASH) | 44 #if !defined(USE_ASH) |
| 45 stacking_client_.reset(); | 45 stacking_client_.reset(); |
| 46 #endif | 46 #endif |
| 47 | 47 |
| 48 // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown | 48 // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown |
| 49 // after the metrics service is deleted. | 49 // after the metrics service is deleted. |
| 50 } | 50 } |
| 51 | 51 |
| 52 namespace browser { | 52 namespace chrome { |
| 53 | 53 |
| 54 void AddAuraToolkitExtraParts(ChromeBrowserMainParts* main_parts) { | 54 void AddAuraToolkitExtraParts(ChromeBrowserMainParts* main_parts) { |
| 55 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); | 55 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); |
| 56 } | 56 } |
| 57 | 57 |
| 58 } // namespace browser | 58 } // namespace chrome |
| OLD | NEW |