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/caps_lock_delegate_stub.h" | 7 #include "ash/caps_lock_delegate_stub.h" |
8 #include "ash/shell/example_factory.h" | 8 #include "ash/shell/example_factory.h" |
9 #include "ash/shell/launcher_delegate_impl.h" | 9 #include "ash/shell/launcher_delegate_impl.h" |
10 #include "ash/shell/context_menu.h" | 10 #include "ash/shell/context_menu.h" |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 } | 166 } |
167 | 167 |
168 double ShellDelegateImpl::GetSavedScreenMagnifierScale() { | 168 double ShellDelegateImpl::GetSavedScreenMagnifierScale() { |
169 return std::numeric_limits<double>::min(); | 169 return std::numeric_limits<double>::min(); |
170 } | 170 } |
171 | 171 |
172 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(aura::RootWindow* root) { | 172 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(aura::RootWindow* root) { |
173 return new ContextMenu(root); | 173 return new ContextMenu(root); |
174 } | 174 } |
175 | 175 |
| 176 aura::client::StackingClient* ShellDelegateImpl::CreateStackingClient() { |
| 177 return NULL; |
| 178 } |
| 179 |
176 } // namespace shell | 180 } // namespace shell |
177 } // namespace ash | 181 } // namespace ash |
OLD | NEW |