diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 21:05:04 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 21:05:04 +0000 |
| commit | be8857a9da76bd9428f78f62feffa92bc2918023 (patch) | |
| tree | f48642693658270ff1214761f3ecd5f6b55c24e0 /chrome/browser/chrome_browser_main_extra_parts_aura.cc | |
| parent | ee847afb8a3c6cb9efba2c625a8a56083df81afb (diff) | |
| download | chromium_src-be8857a9da76bd9428f78f62feffa92bc2918023.zip chromium_src-be8857a9da76bd9428f78f62feffa92bc2918023.tar.gz chromium_src-be8857a9da76bd9428f78f62feffa92bc2918023.tar.bz2 | |
Revert 124461 - Remove the singleton instance get/delete methods from RootWindow (yay)
http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9535025
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9564023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_extra_parts_aura.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_extra_parts_aura.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc index 930dcf1c..6dd359a 100644 --- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc +++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc @@ -77,5 +77,6 @@ void ChromeBrowserMainExtraPartsAura::PostProfileInit() { void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { ash::Shell::DeleteInstance(); + aura::RootWindow::DeleteInstance(); aura::Env::DeleteInstance(); } |