| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 chromeos::MagnificationManager::Get()->IsMagnifierEnabled(); | 69 chromeos::MagnificationManager::Get()->IsMagnifierEnabled(); |
| 70 ash::MagnifierType magnifier_type = | 70 ash::MagnifierType magnifier_type = |
| 71 chromeos::MagnificationManager::Get()->GetMagnifierType(); | 71 chromeos::MagnificationManager::Get()->GetMagnifierType(); |
| 72 shell->magnification_controller()-> | 72 shell->magnification_controller()-> |
| 73 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL); | 73 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL); |
| 74 shell->partial_magnification_controller()-> | 74 shell->partial_magnification_controller()-> |
| 75 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL); | 75 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL); |
| 76 | 76 |
| 77 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 77 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 78 switches::kDisableZeroBrowsersOpenForTests)) { | 78 switches::kDisableZeroBrowsersOpenForTests)) { |
| 79 chrome::StartKeepAlive(); | 79 chrome::IncrementKeepAliveCount(); |
| 80 } | 80 } |
| 81 #endif | 81 #endif |
| 82 ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->Show(); | 82 ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->Show(); |
| 83 } | 83 } |
| 84 | 84 |
| 85 void CloseAsh() { | 85 void CloseAsh() { |
| 86 // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't | 86 // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't |
| 87 // try to cleanup resources. | 87 // try to cleanup resources. |
| 88 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() && | 88 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() && |
| 89 ash::Shell::HasInstance()) { | 89 ash::Shell::HasInstance()) { |
| 90 ash::Shell::DeleteInstance(); | 90 ash::Shell::DeleteInstance(); |
| 91 } | 91 } |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace chrome | 94 } // namespace chrome |
| OLD | NEW |