Chromium Code Reviews| 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 chrome::FocusNextPane(browser); | 158 chrome::FocusNextPane(browser); |
| 159 break; | 159 break; |
| 160 case ash::Shell::BACKWARD: | 160 case ash::Shell::BACKWARD: |
| 161 chrome::FocusPreviousPane(browser); | 161 chrome::FocusPreviousPane(browser); |
| 162 break; | 162 break; |
| 163 } | 163 } |
| 164 return true; | 164 return true; |
| 165 } | 165 } |
| 166 | 166 |
| 167 void ChromeShellDelegate::ShowTaskManager() { | 167 void ChromeShellDelegate::ShowTaskManager() { |
| 168 Browser* browser = chrome::FindOrCreateTabbedBrowser( | 168 Browser* browser = chrome::FindTabbedBrowser( |
| 169 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 169 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
| 170 chrome::HOST_DESKTOP_TYPE_ASH); | 170 false, |
| 171 chrome::HOST_DESKTOP_TYPE_ASH); | |
|
sky
2013/03/21 00:48:07
This isn't quite what I think should happen either
Mr4D (OOO till 08-26)
2013/03/21 00:53:36
Okay - in that case I am not sure what you wanted.
sky
2013/03/21 15:53:20
Here is what I meant:
aura::Window* active = ash:
| |
| 171 chrome::OpenTaskManager(browser, false); | 172 chrome::OpenTaskManager(browser, false); |
| 172 } | 173 } |
| 173 | 174 |
| 174 content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() { | 175 content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() { |
| 175 return ProfileManager::GetDefaultProfile(); | 176 return ProfileManager::GetDefaultProfile(); |
| 176 } | 177 } |
| 177 | 178 |
| 178 app_list::AppListViewDelegate* | 179 app_list::AppListViewDelegate* |
| 179 ChromeShellDelegate::CreateAppListViewDelegate() { | 180 ChromeShellDelegate::CreateAppListViewDelegate() { |
| 180 DCHECK(ash::Shell::HasInstance()); | 181 DCHECK(ash::Shell::HasInstance()); |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 330 } | 331 } |
| 331 | 332 |
| 332 Browser* ChromeShellDelegate::GetTargetBrowser() { | 333 Browser* ChromeShellDelegate::GetTargetBrowser() { |
| 333 Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); | 334 Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); |
| 334 if (browser) | 335 if (browser) |
| 335 return browser; | 336 return browser; |
| 336 return chrome::FindOrCreateTabbedBrowser( | 337 return chrome::FindOrCreateTabbedBrowser( |
| 337 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 338 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
| 338 chrome::HOST_DESKTOP_TYPE_ASH); | 339 chrome::HOST_DESKTOP_TYPE_ASH); |
| 339 } | 340 } |
| OLD | NEW |