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/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
6 | 6 |
7 #include "apps/app_window.h" | 7 #include "apps/app_window.h" |
8 #include "apps/app_window_registry.h" | 8 #include "apps/app_window_registry.h" |
9 #include "ash/content_support/gpu_support_impl.h" | 9 #include "ash/content_support/gpu_support_impl.h" |
10 #include "ash/magnifier/magnifier_constants.h" | 10 #include "ash/magnifier/magnifier_constants.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 #endif | 81 #endif |
82 return true; | 82 return true; |
83 } | 83 } |
84 | 84 |
85 bool ChromeShellDelegate::IsRunningInForcedAppMode() const { | 85 bool ChromeShellDelegate::IsRunningInForcedAppMode() const { |
86 return chrome::IsRunningInForcedAppMode(); | 86 return chrome::IsRunningInForcedAppMode(); |
87 } | 87 } |
88 | 88 |
89 bool ChromeShellDelegate::IsMultiAccountEnabled() const { | 89 bool ChromeShellDelegate::IsMultiAccountEnabled() const { |
90 #if defined(OS_CHROMEOS) | 90 #if defined(OS_CHROMEOS) |
91 return switches::IsNewProfileManagement(); | 91 return switches::IsEnableAccountConsistency(); |
92 #endif | 92 #endif |
93 return false; | 93 return false; |
94 } | 94 } |
95 | 95 |
96 void ChromeShellDelegate::Exit() { | 96 void ChromeShellDelegate::Exit() { |
97 chrome::AttemptUserExit(); | 97 chrome::AttemptUserExit(); |
98 } | 98 } |
99 | 99 |
100 content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() { | 100 content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() { |
101 #if defined(OS_CHROMEOS) | 101 #if defined(OS_CHROMEOS) |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 | 161 |
162 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( | 162 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( |
163 ash::VirtualKeyboardStateObserver* observer) { | 163 ash::VirtualKeyboardStateObserver* observer) { |
164 keyboard_state_observer_list_.AddObserver(observer); | 164 keyboard_state_observer_list_.AddObserver(observer); |
165 } | 165 } |
166 | 166 |
167 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( | 167 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( |
168 ash::VirtualKeyboardStateObserver* observer) { | 168 ash::VirtualKeyboardStateObserver* observer) { |
169 keyboard_state_observer_list_.RemoveObserver(observer); | 169 keyboard_state_observer_list_.RemoveObserver(observer); |
170 } | 170 } |
OLD | NEW |