| 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 "ash/shell/content_client/shell_browser_main_parts.h" | 5 #include "ash/shell/content_client/shell_browser_main_parts.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/desktop_background/desktop_background_controller.h" | 8 #include "ash/desktop_background/desktop_background_controller.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell/shell_delegate_impl.h" | 10 #include "ash/shell/shell_delegate_impl.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 delegate_ = NULL; | 150 delegate_ = NULL; |
| 151 ash::Shell::DeleteInstance(); | 151 ash::Shell::DeleteInstance(); |
| 152 // The global message center state must be shutdown absent | 152 // The global message center state must be shutdown absent |
| 153 // g_browser_process. | 153 // g_browser_process. |
| 154 message_center::MessageCenter::Shutdown(); | 154 message_center::MessageCenter::Shutdown(); |
| 155 | 155 |
| 156 #if defined(OS_CHROMEOS) | 156 #if defined(OS_CHROMEOS) |
| 157 chromeos::CrasAudioHandler::Shutdown(); | 157 chromeos::CrasAudioHandler::Shutdown(); |
| 158 #endif | 158 #endif |
| 159 | 159 |
| 160 aura::Env::DeleteInstance(); | |
| 161 | |
| 162 views_delegate_.reset(); | 160 views_delegate_.reset(); |
| 163 | 161 |
| 164 // The keyboard may have created a WebContents. The WebContents is destroyed | 162 // The keyboard may have created a WebContents. The WebContents is destroyed |
| 165 // with the UI, and it needs the BrowserContext to be alive during its | 163 // with the UI, and it needs the BrowserContext to be alive during its |
| 166 // destruction. So destroy all of the UI elements before destroying the | 164 // destruction. So destroy all of the UI elements before destroying the |
| 167 // browser context. | 165 // browser context. |
| 168 browser_context_.reset(); | 166 browser_context_.reset(); |
| 169 } | 167 } |
| 170 | 168 |
| 171 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 169 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
| 172 base::MessageLoopForUI::current()->Run(); | 170 base::MessageLoopForUI::current()->Run(); |
| 173 return true; | 171 return true; |
| 174 } | 172 } |
| 175 | 173 |
| 176 } // namespace shell | 174 } // namespace shell |
| 177 } // namespace ash | 175 } // namespace ash |
| OLD | NEW |