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

Side by Side Diff: ash/shell/content/client/shell_browser_main_parts.cc

Issue 1871253002: aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot.merge Created 4 years, 8 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
« no previous file with comments | « no previous file | ash/test/ash_interactive_ui_test_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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/content/shell_content_state.h" 8 #include "ash/content/shell_content_state.h"
9 #include "ash/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 ash::Shell::DeleteInstance(); 152 ash::Shell::DeleteInstance();
153 ShellContentState::DestroyInstance(); 153 ShellContentState::DestroyInstance();
154 // The global message center state must be shutdown absent 154 // The global message center state must be shutdown absent
155 // g_browser_process. 155 // g_browser_process.
156 message_center::MessageCenter::Shutdown(); 156 message_center::MessageCenter::Shutdown();
157 157
158 #if defined(OS_CHROMEOS) 158 #if defined(OS_CHROMEOS)
159 chromeos::CrasAudioHandler::Shutdown(); 159 chromeos::CrasAudioHandler::Shutdown();
160 #endif 160 #endif
161 161
162 aura::Env::DeleteInstance();
163
164 views_delegate_.reset(); 162 views_delegate_.reset();
165 163
166 // The keyboard may have created a WebContents. The WebContents is destroyed 164 // The keyboard may have created a WebContents. The WebContents is destroyed
167 // with the UI, and it needs the BrowserContext to be alive during its 165 // with the UI, and it needs the BrowserContext to be alive during its
168 // destruction. So destroy all of the UI elements before destroying the 166 // destruction. So destroy all of the UI elements before destroying the
169 // browser context. 167 // browser context.
170 browser_context_.reset(); 168 browser_context_.reset();
171 } 169 }
172 170
173 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 171 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
174 base::MessageLoop::current()->Run(); 172 base::MessageLoop::current()->Run();
175 return true; 173 return true;
176 } 174 }
177 175
178 } // namespace shell 176 } // namespace shell
179 } // namespace ash 177 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/test/ash_interactive_ui_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698