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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
| 9 #include "ash/container_delegate_aura.h" |
9 #include "ash/content/gpu_support_impl.h" | 10 #include "ash/content/gpu_support_impl.h" |
10 #include "ash/pointer_watcher_delegate_aura.h" | 11 #include "ash/pointer_watcher_delegate_aura.h" |
11 #include "ash/session/session_state_delegate.h" | 12 #include "ash/session/session_state_delegate.h" |
12 #include "ash/wm/common/window_state.h" | 13 #include "ash/wm/common/window_state.h" |
13 #include "ash/wm/window_util.h" | 14 #include "ash/wm/window_util.h" |
14 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
15 #include "build/build_config.h" | 16 #include "build/build_config.h" |
16 #include "chrome/browser/app_mode/app_mode_utils.h" | 17 #include "chrome/browser/app_mode/app_mode_utils.h" |
17 #include "chrome/browser/lifetime/application_lifetime.h" | 18 #include "chrome/browser/lifetime/application_lifetime.h" |
18 #include "chrome/browser/profiles/profile_manager.h" | 19 #include "chrome/browser/profiles/profile_manager.h" |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 | 150 |
150 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate( | 151 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate( |
151 ash::ShelfModel* model) { | 152 ash::ShelfModel* model) { |
152 if (!shelf_delegate_) { | 153 if (!shelf_delegate_) { |
153 shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model); | 154 shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model); |
154 shelf_delegate_->Init(); | 155 shelf_delegate_->Init(); |
155 } | 156 } |
156 return shelf_delegate_; | 157 return shelf_delegate_; |
157 } | 158 } |
158 | 159 |
| 160 std::unique_ptr<ash::ContainerDelegate> |
| 161 ChromeShellDelegate::CreateContainerDelegate() { |
| 162 return base::WrapUnique(new ash::ContainerDelegateAura); |
| 163 } |
| 164 |
159 std::unique_ptr<ash::PointerWatcherDelegate> | 165 std::unique_ptr<ash::PointerWatcherDelegate> |
160 ChromeShellDelegate::CreatePointerWatcherDelegate() { | 166 ChromeShellDelegate::CreatePointerWatcherDelegate() { |
161 return base::WrapUnique(new ash::PointerWatcherDelegateAura); | 167 return base::WrapUnique(new ash::PointerWatcherDelegateAura); |
162 } | 168 } |
163 | 169 |
164 ui::MenuModel* ChromeShellDelegate::CreateContextMenu( | 170 ui::MenuModel* ChromeShellDelegate::CreateContextMenu( |
165 ash::Shelf* shelf, | 171 ash::Shelf* shelf, |
166 const ash::ShelfItem* item) { | 172 const ash::ShelfItem* item) { |
167 DCHECK(shelf_delegate_); | 173 DCHECK(shelf_delegate_); |
168 // Don't show context menu for exclusive app runtime mode. | 174 // Don't show context menu for exclusive app runtime mode. |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 | 233 |
228 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( | 234 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( |
229 ash::VirtualKeyboardStateObserver* observer) { | 235 ash::VirtualKeyboardStateObserver* observer) { |
230 keyboard_state_observer_list_.AddObserver(observer); | 236 keyboard_state_observer_list_.AddObserver(observer); |
231 } | 237 } |
232 | 238 |
233 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( | 239 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( |
234 ash::VirtualKeyboardStateObserver* observer) { | 240 ash::VirtualKeyboardStateObserver* observer) { |
235 keyboard_state_observer_list_.RemoveObserver(observer); | 241 keyboard_state_observer_list_.RemoveObserver(observer); |
236 } | 242 } |
OLD | NEW |