| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 chromeos::MagnificationManager::Get()->IsMagnifierEnabled(); | 100 chromeos::MagnificationManager::Get()->IsMagnifierEnabled(); |
| 101 ash::MagnifierType magnifier_type = | 101 ash::MagnifierType magnifier_type = |
| 102 chromeos::MagnificationManager::Get()->GetMagnifierType(); | 102 chromeos::MagnificationManager::Get()->GetMagnifierType(); |
| 103 ash::Shell::GetInstance()->magnification_controller()-> | 103 ash::Shell::GetInstance()->magnification_controller()-> |
| 104 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL); | 104 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL); |
| 105 ash::Shell::GetInstance()->partial_magnification_controller()-> | 105 ash::Shell::GetInstance()->partial_magnification_controller()-> |
| 106 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL); | 106 SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL); |
| 107 | 107 |
| 108 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 108 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 109 switches::kDisableZeroBrowsersOpenForTests)) { | 109 switches::kDisableZeroBrowsersOpenForTests)) { |
| 110 browser::StartKeepAlive(); | 110 chrome::StartKeepAlive(); |
| 111 } | 111 } |
| 112 #endif | 112 #endif |
| 113 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); | 113 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 void CloseAsh() { | 116 void CloseAsh() { |
| 117 if (ash::Shell::HasInstance()) | 117 if (ash::Shell::HasInstance()) |
| 118 ash::Shell::DeleteInstance(); | 118 ash::Shell::DeleteInstance(); |
| 119 } | 119 } |
| 120 | 120 |
| 121 } // namespace chrome | 121 } // namespace chrome |
| OLD | NEW |