| 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/ui/ash/ash_init.h" | 5 #include "chrome/browser/ui/ash/ash_init.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/high_contrast/high_contrast_controller.h" | 9 #include "ash/high_contrast/high_contrast_controller.h" |
| 10 #include "ash/magnifier/magnification_controller.h" | 10 #include "ash/magnifier/magnification_controller.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 ash::Shell::GetInstance()->magnification_controller()-> | 76 ash::Shell::GetInstance()->magnification_controller()-> |
| 77 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL); | 77 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL); |
| 78 ash::Shell::GetInstance()->partial_magnification_controller()-> | 78 ash::Shell::GetInstance()->partial_magnification_controller()-> |
| 79 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL); | 79 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL); |
| 80 | 80 |
| 81 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 81 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 82 switches::kDisableZeroBrowsersOpenForTests)) { | 82 switches::kDisableZeroBrowsersOpenForTests)) { |
| 83 chrome::StartKeepAlive(); | 83 chrome::StartKeepAlive(); |
| 84 } | 84 } |
| 85 #endif | 85 #endif |
| 86 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); | 86 ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->ShowRootWindow(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 void CloseAsh() { | 89 void CloseAsh() { |
| 90 // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't | 90 // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't |
| 91 // try to cleanup resources. | 91 // try to cleanup resources. |
| 92 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() && | 92 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() && |
| 93 ash::Shell::HasInstance()) { | 93 ash::Shell::HasInstance()) { |
| 94 ash::Shell::DeleteInstance(); | 94 ash::Shell::DeleteInstance(); |
| 95 } | 95 } |
| 96 } | 96 } |
| 97 | 97 |
| 98 } // namespace chrome | 98 } // namespace chrome |
| OLD | NEW |