| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 DCHECK(chromeos::MagnificationManager::Get()); | 77 DCHECK(chromeos::MagnificationManager::Get()); |
| 78 bool magnifier_enabled = | 78 bool magnifier_enabled = |
| 79 chromeos::MagnificationManager::Get()->IsMagnifierEnabled(); | 79 chromeos::MagnificationManager::Get()->IsMagnifierEnabled(); |
| 80 ui::MagnifierType magnifier_type = | 80 ui::MagnifierType magnifier_type = |
| 81 chromeos::MagnificationManager::Get()->GetMagnifierType(); | 81 chromeos::MagnificationManager::Get()->GetMagnifierType(); |
| 82 shell->magnification_controller()-> | 82 shell->magnification_controller()-> |
| 83 SetEnabled(magnifier_enabled && magnifier_type == ui::MAGNIFIER_FULL); | 83 SetEnabled(magnifier_enabled && magnifier_type == ui::MAGNIFIER_FULL); |
| 84 shell->partial_magnification_controller()-> | 84 shell->partial_magnification_controller()-> |
| 85 SetEnabled(magnifier_enabled && magnifier_type == ui::MAGNIFIER_PARTIAL); | 85 SetEnabled(magnifier_enabled && magnifier_type == ui::MAGNIFIER_PARTIAL); |
| 86 | 86 |
| 87 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 87 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 88 switches::kDisableZeroBrowsersOpenForTests)) { | 88 switches::kDisableZeroBrowsersOpenForTests)) { |
| 89 chrome::IncrementKeepAliveCount(); | 89 chrome::IncrementKeepAliveCount(); |
| 90 } | 90 } |
| 91 #endif | 91 #endif |
| 92 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); | 92 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); |
| 93 } | 93 } |
| 94 | 94 |
| 95 void CloseAsh() { | 95 void CloseAsh() { |
| 96 if (ash::Shell::HasInstance()) | 96 if (ash::Shell::HasInstance()) |
| 97 ash::Shell::DeleteInstance(); | 97 ash::Shell::DeleteInstance(); |
| 98 } | 98 } |
| 99 | 99 |
| 100 } // namespace chrome | 100 } // namespace chrome |
| OLD | NEW |