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

Side by Side Diff: chrome/browser/chrome_browser_main_extra_parts_aura.cc

Issue 8774029: Delete desktop/shell instance correctly when chrome is shutting down (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: close windows before observers are destroyed. Created 9 years 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
« no previous file with comments | « chrome/browser/chrome_browser_main_extra_parts_aura.h ('k') | ui/aura/desktop_host_linux.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" 6 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
7 #include "chrome/browser/ui/views/aura/screen_orientation_listener.h" 7 #include "chrome/browser/ui/views/aura/screen_orientation_listener.h"
8 #include "ui/aura/desktop.h" 8 #include "ui/aura/desktop.h"
9 #include "ui/aura_shell/shell.h" 9 #include "ui/aura_shell/shell.h"
10 10
(...skipping 10 matching lines...) Expand all
21 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) 21 if (chromeos::system::runtime_environment::IsRunningOnChromeOS())
22 aura::Desktop::set_use_fullscreen_host_window(true); 22 aura::Desktop::set_use_fullscreen_host_window(true);
23 #endif 23 #endif
24 24
25 // Shell takes ownership of ChromeShellDelegate. 25 // Shell takes ownership of ChromeShellDelegate.
26 aura_shell::Shell::CreateInstance(new ChromeShellDelegate); 26 aura_shell::Shell::CreateInstance(new ChromeShellDelegate);
27 27
28 // Make sure the singleton ScreenOrientationListener object is created. 28 // Make sure the singleton ScreenOrientationListener object is created.
29 ScreenOrientationListener::GetInstance(); 29 ScreenOrientationListener::GetInstance();
30 } 30 }
31
32 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
33 aura_shell::Shell::DeleteInstance();
34 aura::Desktop::DeleteInstance();
35 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_extra_parts_aura.h ('k') | ui/aura/desktop_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698