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 "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 Loading... |
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 } |
OLD | NEW |