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 "apps/shell_window.h" | 7 #include "apps/shell_window.h" |
8 #include "apps/shell_window_registry.h" | 8 #include "apps/shell_window_registry.h" |
9 #include "apps/ui/native_app_window.h" | 9 #include "apps/ui/native_app_window.h" |
10 #include "ash/host/root_window_host_factory.h" | 10 #include "ash/host/root_window_host_factory.h" |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 content::RecordAction( | 411 content::RecordAction( |
412 content::UserMetricsAction("WindowSelector_Overview")); | 412 content::UserMetricsAction("WindowSelector_Overview")); |
413 break; | 413 break; |
414 case ash::UMA_WINDOW_SELECTION: | 414 case ash::UMA_WINDOW_SELECTION: |
415 content::RecordAction( | 415 content::RecordAction( |
416 content::UserMetricsAction("WindowSelector_Selection")); | 416 content::UserMetricsAction("WindowSelector_Selection")); |
417 break; | 417 break; |
418 } | 418 } |
419 } | 419 } |
420 | 420 |
421 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::RootWindow* root) { | 421 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::Window* root) { |
422 DCHECK(launcher_delegate_); | 422 DCHECK(launcher_delegate_); |
423 // Don't show context menu for exclusive app runtime mode. | 423 // Don't show context menu for exclusive app runtime mode. |
424 if (chrome::IsRunningInAppMode()) | 424 if (chrome::IsRunningInAppMode()) |
425 return NULL; | 425 return NULL; |
426 | 426 |
427 return new LauncherContextMenu(launcher_delegate_, root); | 427 return new LauncherContextMenu(launcher_delegate_, root); |
428 } | 428 } |
429 | 429 |
430 ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() { | 430 ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() { |
431 return ash::RootWindowHostFactory::Create(); | 431 return ash::RootWindowHostFactory::Create(); |
(...skipping 13 matching lines...) Expand all Loading... |
445 } | 445 } |
446 | 446 |
447 Browser* ChromeShellDelegate::GetTargetBrowserIfAvailable() { | 447 Browser* ChromeShellDelegate::GetTargetBrowserIfAvailable() { |
448 return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); | 448 return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); |
449 } | 449 } |
450 | 450 |
451 keyboard::KeyboardControllerProxy* | 451 keyboard::KeyboardControllerProxy* |
452 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 452 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
453 return new AshKeyboardControllerProxy(); | 453 return new AshKeyboardControllerProxy(); |
454 } | 454 } |
OLD | NEW |