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 "ash/shell/shell_delegate_impl.h" | 5 #include "ash/shell/shell_delegate_impl.h" |
6 | 6 |
7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
8 #include "ash/default_accessibility_delegate.h" | 8 #include "ash/default_accessibility_delegate.h" |
9 #include "ash/default_user_wallpaper_delegate.h" | 9 #include "ash/default_user_wallpaper_delegate.h" |
10 #include "ash/gpu_support_stub.h" | 10 #include "ash/gpu_support_stub.h" |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 return false; | 177 return false; |
178 } | 178 } |
179 | 179 |
180 void ShellDelegateImpl::PreInit() { | 180 void ShellDelegateImpl::PreInit() { |
181 } | 181 } |
182 | 182 |
183 void ShellDelegateImpl::PreShutdown() { | 183 void ShellDelegateImpl::PreShutdown() { |
184 } | 184 } |
185 | 185 |
186 void ShellDelegateImpl::Exit() { | 186 void ShellDelegateImpl::Exit() { |
187 base::MessageLoopForUI::current()->Quit(); | 187 base::MessageLoopForUI::current()->QuitWhenIdle(); |
188 } | 188 } |
189 | 189 |
190 keyboard::KeyboardUI* ShellDelegateImpl::CreateKeyboardUI() { | 190 keyboard::KeyboardUI* ShellDelegateImpl::CreateKeyboardUI() { |
191 return new TestKeyboardUI; | 191 return new TestKeyboardUI; |
192 } | 192 } |
193 | 193 |
194 void ShellDelegateImpl::VirtualKeyboardActivated(bool activated) { | 194 void ShellDelegateImpl::VirtualKeyboardActivated(bool activated) { |
195 } | 195 } |
196 | 196 |
197 void ShellDelegateImpl::AddVirtualKeyboardStateObserver( | 197 void ShellDelegateImpl::AddVirtualKeyboardStateObserver( |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 base::string16 ShellDelegateImpl::GetProductName() const { | 252 base::string16 ShellDelegateImpl::GetProductName() const { |
253 return base::string16(); | 253 return base::string16(); |
254 } | 254 } |
255 | 255 |
256 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { | 256 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { |
257 return gfx::Image(); | 257 return gfx::Image(); |
258 } | 258 } |
259 | 259 |
260 } // namespace shell | 260 } // namespace shell |
261 } // namespace ash | 261 } // namespace ash |
OLD | NEW |