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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 switches::kAuraHostWindowUseFullscreen); | 48 switches::kAuraHostWindowUseFullscreen); |
49 | 49 |
50 #if defined(OS_CHROMEOS) | 50 #if defined(OS_CHROMEOS) |
51 if (base::chromeos::IsRunningOnChromeOS()) | 51 if (base::chromeos::IsRunningOnChromeOS()) |
52 use_fullscreen = true; | 52 use_fullscreen = true; |
53 #endif | 53 #endif |
54 | 54 |
55 if (use_fullscreen) { | 55 if (use_fullscreen) { |
56 aura::DisplayManager::set_use_fullscreen_host_window(true); | 56 aura::DisplayManager::set_use_fullscreen_host_window(true); |
57 #if defined(OS_CHROMEOS) | 57 #if defined(OS_CHROMEOS) |
58 aura::RootWindow::set_hide_host_cursor(true); | |
59 // Hide the mouse cursor completely at boot. | 58 // Hide the mouse cursor completely at boot. |
60 if (!chromeos::UserManager::Get()->IsUserLoggedIn()) | 59 if (!chromeos::UserManager::Get()->IsUserLoggedIn()) |
61 ash::Shell::set_initially_hide_cursor(true); | 60 ash::Shell::set_initially_hide_cursor(true); |
62 #endif | 61 #endif |
63 } | 62 } |
64 | 63 |
65 // Its easier to mark all windows as persisting and exclude the ones we care | 64 // Its easier to mark all windows as persisting and exclude the ones we care |
66 // about (browser windows), rather than explicitly excluding certain windows. | 65 // about (browser windows), rather than explicitly excluding certain windows. |
67 ash::SetDefaultPersistsAcrossAllWorkspaces(true); | 66 ash::SetDefaultPersistsAcrossAllWorkspaces(true); |
68 | 67 |
(...skipping 25 matching lines...) Expand all Loading... |
94 #endif | 93 #endif |
95 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); | 94 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); |
96 } | 95 } |
97 | 96 |
98 void CloseAsh() { | 97 void CloseAsh() { |
99 if (ash::Shell::GetInstance()) | 98 if (ash::Shell::GetInstance()) |
100 ash::Shell::DeleteInstance(); | 99 ash::Shell::DeleteInstance(); |
101 } | 100 } |
102 | 101 |
103 } // namespace chrome | 102 } // namespace chrome |
OLD | NEW |