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

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

Issue 9535025: Remove the singleton instance get/delete methods from RootWindow (yay) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
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 "chrome/browser/chrome_browser_main_extra_parts_aura.h" 5 #include "chrome/browser/chrome_browser_main_extra_parts_aura.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 void ChromeBrowserMainExtraPartsAura::PostProfileInit() { 70 void ChromeBrowserMainExtraPartsAura::PostProfileInit() {
71 // Add the status area buttons after Profile has been initialized. 71 // Add the status area buttons after Profile has been initialized.
72 if (!CommandLine::ForCurrentProcess()->HasSwitch( 72 if (!CommandLine::ForCurrentProcess()->HasSwitch(
73 ash::switches::kAshUberTray)) { 73 ash::switches::kAshUberTray)) {
74 ChromeShellDelegate::instance()->status_area_host()->AddButtons(); 74 ChromeShellDelegate::instance()->status_area_host()->AddButtons();
75 } 75 }
76 } 76 }
77 77
78 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { 78 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
79 ash::Shell::DeleteInstance(); 79 ash::Shell::DeleteInstance();
80 aura::RootWindow::DeleteInstance();
81 aura::Env::DeleteInstance(); 80 aura::Env::DeleteInstance();
82 } 81 }
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698