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 "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/host/root_window_host_factory.h" | 8 #include "ash/host/root_window_host_factory.h" |
9 #include "ash/launcher/launcher_types.h" | 9 #include "ash/launcher/launcher_types.h" |
10 #include "ash/magnifier/magnifier_constants.h" | 10 #include "ash/magnifier/magnifier_constants.h" |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 | 219 |
220 if (service->IsLoaded()) { | 220 if (service->IsLoaded()) { |
221 RestoreTabUsingProfile(profile); | 221 RestoreTabUsingProfile(profile); |
222 } else { | 222 } else { |
223 tab_restore_helper_.reset(new TabRestoreHelper(this, profile, service)); | 223 tab_restore_helper_.reset(new TabRestoreHelper(this, profile, service)); |
224 service->LoadTabsFromLastSession(); | 224 service->LoadTabsFromLastSession(); |
225 } | 225 } |
226 } | 226 } |
227 | 227 |
228 void ChromeShellDelegate::ShowTaskManager() { | 228 void ChromeShellDelegate::ShowTaskManager() { |
229 chrome::OpenTaskManager(NULL, false); | 229 chrome::OpenTaskManager(NULL); |
230 } | 230 } |
231 | 231 |
232 content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() { | 232 content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() { |
233 return ProfileManager::GetDefaultProfile(); | 233 return ProfileManager::GetDefaultProfile(); |
234 } | 234 } |
235 | 235 |
236 app_list::AppListViewDelegate* | 236 app_list::AppListViewDelegate* |
237 ChromeShellDelegate::CreateAppListViewDelegate() { | 237 ChromeShellDelegate::CreateAppListViewDelegate() { |
238 DCHECK(ash::Shell::HasInstance()); | 238 DCHECK(ash::Shell::HasInstance()); |
239 // Shell will own the created delegate, and the delegate will own | 239 // Shell will own the created delegate, and the delegate will own |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 return browser; | 436 return browser; |
437 return chrome::FindOrCreateTabbedBrowser( | 437 return chrome::FindOrCreateTabbedBrowser( |
438 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 438 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
439 chrome::HOST_DESKTOP_TYPE_ASH); | 439 chrome::HOST_DESKTOP_TYPE_ASH); |
440 } | 440 } |
441 | 441 |
442 keyboard::KeyboardControllerProxy* | 442 keyboard::KeyboardControllerProxy* |
443 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 443 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
444 return new AshKeyboardControllerProxy(); | 444 return new AshKeyboardControllerProxy(); |
445 } | 445 } |
OLD | NEW |