| 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/launcher/launcher_types.h" | 7 #include "ash/launcher/launcher_types.h" |
| 8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
| 9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 break; | 276 break; |
| 277 } | 277 } |
| 278 return true; | 278 return true; |
| 279 } | 279 } |
| 280 | 280 |
| 281 void ChromeShellDelegate::ShowKeyboardOverlay() { | 281 void ChromeShellDelegate::ShowKeyboardOverlay() { |
| 282 #if defined(OS_CHROMEOS) | 282 #if defined(OS_CHROMEOS) |
| 283 // TODO(mazda): Move the show logic to ash (http://crbug.com/124222). | 283 // TODO(mazda): Move the show logic to ash (http://crbug.com/124222). |
| 284 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); | 284 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); |
| 285 std::string url(chrome::kChromeUIKeyboardOverlayURL); | 285 std::string url(chrome::kChromeUIKeyboardOverlayURL); |
| 286 KeyboardOverlayView::ShowDialog(profile, | 286 ash::KeyboardOverlayView::ShowDialog(profile, |
| 287 new ChromeWebContentsHandler, | 287 new ChromeWebContentsHandler, |
| 288 GURL(url)); | 288 GURL(url)); |
| 289 #endif | 289 #endif |
| 290 } | 290 } |
| 291 | 291 |
| 292 void ChromeShellDelegate::ShowTaskManager() { | 292 void ChromeShellDelegate::ShowTaskManager() { |
| 293 Browser* browser = browser::FindOrCreateTabbedBrowser( | 293 Browser* browser = browser::FindOrCreateTabbedBrowser( |
| 294 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 294 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
| 295 chrome::HOST_DESKTOP_TYPE_ASH); | 295 chrome::HOST_DESKTOP_TYPE_ASH); |
| 296 chrome::OpenTaskManager(browser, false); | 296 chrome::OpenTaskManager(browser, false); |
| 297 } | 297 } |
| 298 | 298 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 462 ash::Shell::GetInstance()->ShowLauncher(); | 462 ash::Shell::GetInstance()->ShowLauncher(); |
| 463 break; | 463 break; |
| 464 default: | 464 default: |
| 465 NOTREACHED() << "Unexpected notification " << type; | 465 NOTREACHED() << "Unexpected notification " << type; |
| 466 } | 466 } |
| 467 #else | 467 #else |
| 468 // MSVC++ warns about switch statements without any cases. | 468 // MSVC++ warns about switch statements without any cases. |
| 469 NOTREACHED() << "Unexpected notification " << type; | 469 NOTREACHED() << "Unexpected notification " << type; |
| 470 #endif | 470 #endif |
| 471 } | 471 } |
| OLD | NEW |