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/native_app_window.h" | |
8 #include "apps/shell_window.h" | 7 #include "apps/shell_window.h" |
9 #include "apps/shell_window_registry.h" | 8 #include "apps/shell_window_registry.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" |
11 #include "ash/magnifier/magnifier_constants.h" | 11 #include "ash/magnifier/magnifier_constants.h" |
12 #include "ash/session_state_delegate.h" | 12 #include "ash/session_state_delegate.h" |
13 #include "ash/system/tray/system_tray_delegate.h" | 13 #include "ash/system/tray/system_tray_delegate.h" |
14 #include "ash/wm/window_state.h" | 14 #include "ash/wm/window_state.h" |
15 #include "ash/wm/window_util.h" | 15 #include "ash/wm/window_util.h" |
16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
17 #include "base/prefs/pref_service.h" | 17 #include "base/prefs/pref_service.h" |
18 #include "chrome/browser/app_mode/app_mode_utils.h" | 18 #include "chrome/browser/app_mode/app_mode_utils.h" |
19 #include "chrome/browser/lifetime/application_lifetime.h" | 19 #include "chrome/browser/lifetime/application_lifetime.h" |
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 } | 458 } |
459 | 459 |
460 Browser* ChromeShellDelegate::GetTargetBrowserIfAvailable() { | 460 Browser* ChromeShellDelegate::GetTargetBrowserIfAvailable() { |
461 return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); | 461 return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); |
462 } | 462 } |
463 | 463 |
464 keyboard::KeyboardControllerProxy* | 464 keyboard::KeyboardControllerProxy* |
465 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 465 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
466 return new AshKeyboardControllerProxy(); | 466 return new AshKeyboardControllerProxy(); |
467 } | 467 } |
OLD | NEW |